Merge branch 'main' into 'registry-rpm-module'

Update CI configuration

See merge request abramda/netbox-plugins-for-git-lab-pilot!1

.gitlab-ci.yml

+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
+
 default:
   tags:
     - ovh

env/netbox.env

 CORS_ORIGIN_ALLOW_ALL=True
+DB_HOST=postgres
 DB_NAME=netbox
 DB_PASSWORD=J5brHrAXFLQSif0K
 DB_USER=netbox
 BD_CONN_MAX_AGE=0
+DB_WAIT_DEBUG=1
 EMAIL_FROM=netbox@bar.com
 EMAIL_PASSWORD=
 EMAIL_PORT=25
@@ -18,10 +20,12 @@ GRAPHQL_ENABLED=true
 HOUSEKEEPING_INTERVAL=86400
 MEDIA_ROOT=/opt/netbox/netbox/media
 METRICS_ENABLED=true
+REDIS_CACHE_HOST=redis-cache
 REDIS_CACHE_DATABASE=1
 REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY=false
 REDIS_CACHE_PASSWORD=t4Ph722qJ5QHeQ1qfu36
 REDIS_CACHE_SSL=false
+REDIS_HOST=redis
 REDIS_DATABASE=0
 REDIS_INSECURE_SKIP_TLS_VERIFY=false
 REDIS_PASSWORD=H733Kdjndks81

netbox_configuration/plugins.py

-PLUGINS = ['netbox_dns', 'netbox_rps_plugin', 'netbox_cert_plugin', 'netbox_prometheus_sd']
+PLUGINS = ['netbox_dns', 'netbox_rps_plugin', 'netbox_cert_plugin', 'netbox_prometheus_sd', 'netbox_docker_plugin']

requirements.txt

@@ -2,3 +2,4 @@
 /opt/netbox/plugins/netbox-cert-plugin
 netbox-plugin-dns == 0.19.*
 netbox-plugin-prometheus-sd
+netbox-docker-plugin