LHJ removed postgres

This commit is contained in:
Ludwig Jordaan 2025-04-09 14:23:09 +00:00
parent 477decd80a
commit 473ebc4a5a
3 changed files with 28 additions and 27 deletions

View file

@ -2,8 +2,8 @@ services:
netbox: &netbox netbox: &netbox
image: ${IMAGE-docker.io/netboxcommunity/netbox:latest} image: ${IMAGE-docker.io/netboxcommunity/netbox:latest}
depends_on: depends_on:
postgres: # postgres:
condition: service_healthy # condition: service_healthy
redis: redis:
condition: service_healthy condition: service_healthy
redis-cache: redis-cache:
@ -38,15 +38,15 @@ services:
timeout: 3s timeout: 3s
interval: 15s interval: 15s
postgres: # postgres:
image: docker.io/postgres:17-alpine # image: docker.io/postgres:17-alpine
env_file: env/postgres.env # env_file: env/postgres.env
healthcheck: # healthcheck:
test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose # test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose
start_period: 20s # start_period: 20s
interval: 1s # interval: 1s
timeout: 5s # timeout: 5s
retries: 5 # retries: 5
redis: &redis redis: &redis
image: docker.io/valkey/valkey:8.1-alpine image: docker.io/valkey/valkey:8.1-alpine

View file

@ -2,7 +2,7 @@ services:
netbox: &netbox netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0} image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0}
depends_on: depends_on:
- postgres #- postgres
- redis - redis
- redis-cache - redis-cache
env_file: env/netbox.env env_file: env/netbox.env
@ -45,17 +45,17 @@ services:
interval: 15s interval: 15s
# postgres # postgres
postgres: #postgres:
image: docker.io/postgres:17-alpine # image: docker.io/postgres:17-alpine
healthcheck: # healthcheck:
test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER # test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
start_period: 20s # start_period: 20s
timeout: 30s # timeout: 30s
interval: 10s # interval: 10s
retries: 5 # retries: 5
env_file: env/postgres.env # env_file: env/postgres.env
volumes: # volumes:
- netbox-postgres-data:/var/lib/postgresql/data # - netbox-postgres-data:/var/lib/postgresql/data
# redis # redis
redis: redis:

9
env/netbox.env vendored
View file

@ -1,8 +1,9 @@
CORS_ORIGIN_ALLOW_ALL=True CORS_ORIGIN_ALLOW_ALL=True
DB_HOST=postgres #DB_HOST=postgres
DB_NAME=netbox DB_HOST=postgres02.dfelocal.jennyme.co.za
DB_PASSWORD=J5brHrAXFLQSif0K DB_NAME=jenny_netbox01
DB_USER=netbox DB_PASSWORD=5GnJ0nRHYkoLtu
DB_USER=jenny_netbox01
EMAIL_FROM=netbox@bar.com EMAIL_FROM=netbox@bar.com
EMAIL_PASSWORD= EMAIL_PASSWORD=
EMAIL_PORT=25 EMAIL_PORT=25