diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 832e21822113ff54dd9ecece4710271f1fc470b0..c1d82f0c6877744413002ac86ca5838d2497672c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,34 +1,33 @@ version: '3.4' services: - netbox: - volumes: - - netbox-media-files:/opt/netbox/netbox/media:z,rw - - netbox-reports-files:/opt/netbox/netbox/reports:z,rw - - netbox-scripts-files:/opt/netbox/netbox/scripts:z,rw - # postgres - postgres: - volumes: - - netbox-postgres-data:/var/lib/postgresql/data - # redis - redis: - volumes: - - netbox-redis-data:/data - redis-cache: - volumes: - - netbox-redis-cache-data:/data - + netbox: + volumes: + - netbox-media-files:/opt/netbox/netbox/media:z,rw + - netbox-reports-files:/opt/netbox/netbox/reports:z,rw + - netbox-scripts-files:/opt/netbox/netbox/scripts:z,rw + # postgres + postgres: + volumes: + - netbox-postgres-data:/var/lib/postgresql/data + # redis + redis: + volumes: + - netbox-redis-data:/data + redis-cache: + volumes: + - netbox-redis-cache-data:/data volumes: - netbox-media-files: - driver: local - netbox-postgres-data: - driver: local - netbox-redis-cache-data: - driver: local - netbox-redis-data: - driver: local - netbox-reports-files: - driver: local - netbox-scripts-files: - driver: local + netbox-media-files: + driver: local + netbox-postgres-data: + driver: local + netbox-redis-cache-data: + driver: local + netbox-redis-data: + driver: local + netbox-reports-files: + driver: local + netbox-scripts-files: + driver: local diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 44c7d5fd9a9ef21470b06dedc3fb975d93dc296f..68c2bec4c9aa03ce004a48080fd247d3f4637381 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,58 +1,58 @@ version: '3.4' services: - netbox: - image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" - ports: - - 8080:8080 - healthcheck: - start_period: 2s - retries: 30 - env_file: env/netbox.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox" - netbox-worker: - image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" - env_file: env/netbox.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox-worker" - netbox-housekeeping: - image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" - env_file: env/netbox.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox-housekeeping" - postgres: - env_file: env/postgres.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox-postgres" - redis: - env_file: env/redis.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox-redis" - redis-cache: - env_file: env/redis-cache.env - logging: - driver: "syslog" - options: - syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" - syslog-format: "rfc5424" - tag: "netbox-cache" + netbox: + image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" + ports: + - 8080:8080 + healthcheck: + start_period: 2s + retries: 30 + env_file: env/netbox.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox" + netbox-worker: + image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" + env_file: env/netbox.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox-worker" + netbox-housekeeping: + image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}" + env_file: env/netbox.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox-housekeeping" + postgres: + env_file: env/postgres.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox-postgres" + redis: + env_file: env/redis.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox-redis" + redis-cache: + env_file: env/redis-cache.env + logging: + driver: "syslog" + options: + syslog-address: "tcp://gra1-63cfda8371ef06f3c6bf175c.gra1.logs.ovh.com:6514" + syslog-format: "rfc5424" + tag: "netbox-cache" diff --git a/docker-compose.yml b/docker-compose.yml index 53e339c3023128e2e9a6046d0afd4c41df4e6bd3..361dc0c6250ea94aa101e5b0b5ccd1f2342d3fa0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,82 +1,82 @@ version: '3.4' services: - netbox: &netbox - image: code.europa.eu:4567/digit-c4/netbox-plugins:latest - depends_on: - - postgres - - redis - - redis-cache - user: 'unit:root' - healthcheck: - start_period: 60s - timeout: 3s - interval: 15s - test: "curl -f http://localhost:8080/api/ || exit 1" - volumes: - - netbox-media-files:/opt/netbox/netbox/media:z,rw - - netbox-reports-files:/opt/netbox/netbox/reports:z,rw - - netbox-scripts-files:/opt/netbox/netbox/scripts:z,rw - netbox-worker: - <<: *netbox - depends_on: - netbox: - condition: service_healthy - command: - - /opt/netbox/venv/bin/python - - /opt/netbox/netbox/manage.py - - rqworker - healthcheck: - start_period: 20s - timeout: 3s - interval: 15s - test: "ps -aux | grep -v grep | grep -q rqworker || exit 1" - netbox-housekeeping: - <<: *netbox - depends_on: - netbox: - condition: service_healthy - command: - - /opt/netbox/housekeeping.sh - healthcheck: - start_period: 20s - timeout: 3s - interval: 15s - test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1" + netbox: &netbox + image: code.europa.eu:4567/digit-c4/netbox-plugins:latest + depends_on: + - postgres + - redis + - redis-cache + user: 'unit:root' + healthcheck: + start_period: 60s + timeout: 3s + interval: 15s + test: "curl -f http://localhost:8080/api/ || exit 1" + volumes: + - netbox-media-files:/opt/netbox/netbox/media:z,rw + - netbox-reports-files:/opt/netbox/netbox/reports:z,rw + - netbox-scripts-files:/opt/netbox/netbox/scripts:z,rw + netbox-worker: + <<: *netbox + depends_on: + netbox: + condition: service_healthy + command: + - /opt/netbox/venv/bin/python + - /opt/netbox/netbox/manage.py + - rqworker + healthcheck: + start_period: 20s + timeout: 3s + interval: 15s + test: "ps -aux | grep -v grep | grep -q rqworker || exit 1" + netbox-housekeeping: + <<: *netbox + depends_on: + netbox: + condition: service_healthy + command: + - /opt/netbox/housekeeping.sh + healthcheck: + start_period: 20s + timeout: 3s + interval: 15s + test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1" - # postgres - postgres: - image: docker.io/postgres:15-alpine - volumes: - - netbox-postgres-data:/var/lib/postgresql/data + # postgres + postgres: + image: docker.io/postgres:15-alpine + volumes: + - netbox-postgres-data:/var/lib/postgresql/data - # redis - redis: - image: docker.io/redis:7-alpine - command: - - sh - - -c # this is to evaluate the $REDIS_PASSWORD from the env - - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose - volumes: - - netbox-redis-data:/data - redis-cache: - image: docker.io/redis:7-alpine - command: - - sh - - -c # this is to evaluate the $REDIS_PASSWORD from the env - - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose - volumes: - - netbox-redis-cache-data:/data + # redis + redis: + image: docker.io/redis:7-alpine + command: + - sh + - -c # this is to evaluate the $REDIS_PASSWORD from the env + - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose + volumes: + - netbox-redis-data:/data + redis-cache: + image: docker.io/redis:7-alpine + command: + - sh + - -c # this is to evaluate the $REDIS_PASSWORD from the env + - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose + volumes: + - netbox-redis-cache-data:/data volumes: - netbox-media-files: - driver: local - netbox-postgres-data: - driver: local - netbox-redis-cache-data: - driver: local - netbox-redis-data: - driver: local - netbox-reports-files: - driver: local - netbox-scripts-files: - driver: local + netbox-media-files: + driver: local + netbox-postgres-data: + driver: local + netbox-redis-cache-data: + driver: local + netbox-redis-data: + driver: local + netbox-reports-files: + driver: local + netbox-scripts-files: + driver: local diff --git a/requirements.txt b/requirements.txt index c77cd0165e46cef487c88baa4a2735c29dd46903..b54d9d96a7a79b1ef668cf6e7d57f42aab6aa0a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ /opt/netbox/plugins/netbox-rps-plugin /opt/netbox/plugins/netbox-cert-plugin -netbox-plugin-dns<0.19.0 +netbox-plugin-dns == 0.19.* netbox-plugin-prometheus-sd