diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 98a6c19a..8e89790f 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -9,9 +9,9 @@ services: redis-cache: condition: service_healthy env_file: env/netbox.env - user: 'unit:root' + user: "unit:root" volumes: - - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro + - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro healthcheck: test: curl -f http://localhost:8080/login/ || exit 1 start_period: ${NETBOX_START_PERIOD-120s} @@ -20,9 +20,9 @@ services: netbox-worker: <<: *netbox command: - - /opt/netbox/venv/bin/python - - /opt/netbox/netbox/manage.py - - rqworker + - /opt/netbox/venv/bin/python + - /opt/netbox/netbox/manage.py + - rqworker healthcheck: test: ps -aux | grep -v grep | grep -q rqworker || exit 1 start_period: 40s @@ -31,7 +31,7 @@ services: netbox-housekeeping: <<: *netbox command: - - /opt/netbox/housekeeping.sh + - /opt/netbox/housekeeping.sh healthcheck: test: ps -aux | grep -v grep | grep -q housekeeping || exit 1 start_period: 40s @@ -39,7 +39,7 @@ services: interval: 15s postgres: - image: docker.io/postgres:16-alpine + image: docker.io/postgres:17-alpine env_file: env/postgres.env healthcheck: test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose @@ -51,12 +51,12 @@ services: redis: &redis image: docker.io/valkey/valkey:8.0-alpine command: - - sh - - -c # this is to evaluate the $REDIS_PASSWORD from the env - - valkey-server --save "" --appendonly no --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose + - sh + - -c # this is to evaluate the $REDIS_PASSWORD from the env + - valkey-server --save "" --appendonly no --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose env_file: env/redis.env healthcheck: - test: "[ $$(valkey-cli --pass \"$${REDIS_PASSWORD}\" ping) = 'PONG' ]" + test: '[ $$(valkey-cli --pass "$${REDIS_PASSWORD}" ping) = ''PONG'' ]' start_period: 5s timeout: 3s interval: 1s diff --git a/docker-compose.yml b/docker-compose.yml index a00825c7..1e27d91e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: # postgres postgres: - image: docker.io/postgres:16-alpine + image: docker.io/postgres:17-alpine healthcheck: test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER start_period: 20s