diff --git a/docker-compose.test.yml b/docker-compose.test.yml index bbc139c..00c2dc8 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -2,8 +2,8 @@ services: netbox: &netbox image: ${IMAGE-docker.io/netboxcommunity/netbox:latest} depends_on: - postgres: - condition: service_healthy + # postgres: + # condition: service_healthy redis: condition: service_healthy redis-cache: @@ -38,15 +38,15 @@ services: timeout: 3s interval: 15s - postgres: - 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 - start_period: 20s - interval: 1s - timeout: 5s - retries: 5 + # postgres: + # 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 + # start_period: 20s + # interval: 1s + # timeout: 5s + # retries: 5 redis: &redis image: docker.io/valkey/valkey:8.1-alpine diff --git a/docker-compose.yml b/docker-compose.yml index 3ba2fd4..23b15ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: netbox: &netbox image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0} depends_on: - - postgres + #- postgres - redis - redis-cache env_file: env/netbox.env @@ -45,17 +45,17 @@ services: interval: 15s # postgres - postgres: - image: docker.io/postgres:17-alpine - healthcheck: - test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER - start_period: 20s - timeout: 30s - interval: 10s - retries: 5 - env_file: env/postgres.env - volumes: - - netbox-postgres-data:/var/lib/postgresql/data + #postgres: + # image: docker.io/postgres:17-alpine + # healthcheck: + # test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER + # start_period: 20s + # timeout: 30s + # interval: 10s + # retries: 5 + # env_file: env/postgres.env + # volumes: + # - netbox-postgres-data:/var/lib/postgresql/data # redis redis: diff --git a/env/netbox.env b/env/netbox.env index ca22549..4b58214 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -1,8 +1,9 @@ CORS_ORIGIN_ALLOW_ALL=True -DB_HOST=postgres -DB_NAME=netbox -DB_PASSWORD=J5brHrAXFLQSif0K -DB_USER=netbox +#DB_HOST=postgres +DB_HOST=postgres02.dfelocal.jennyme.co.za +DB_NAME=jenny_netbox01 +DB_PASSWORD=5GnJ0nRHYkoLtu +DB_USER=jenny_netbox01 EMAIL_FROM=netbox@bar.com EMAIL_PASSWORD= EMAIL_PORT=25