diff --git a/docker-compose.yml b/docker-compose.yml index 6f2b586..dcd47ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,8 @@ services: condition: service_started redis: condition: service_healthy + env_file: + - netbox.env environment: - DB_HOST=postgresql.taila5ad8.ts.net - DB_PORT=5432 @@ -45,6 +47,8 @@ services: - DB_PASSWORD=${DB_PASSWORD} - REDIS_HOST=redis - REDIS_PORT=6379 + - REDIS_CACHE_HOST=redis + - REDIS_CACHE_PORT=6379 - SECRET_KEY=${SECRET_KEY} - SUPERUSER_NAME=${SUPERUSER_NAME} - SUPERUSER_EMAIL=${SUPERUSER_EMAIL} @@ -61,7 +65,10 @@ services: container_name: netbox-worker depends_on: - netbox + - redis command: /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py rqworker high default low + env_file: + - netbox.env environment: - DB_HOST=postgresql.taila5ad8.ts.net - DB_PORT=5432 @@ -70,6 +77,8 @@ services: - DB_PASSWORD=${DB_PASSWORD} - REDIS_HOST=redis - REDIS_PORT=6379 + - REDIS_CACHE_HOST=redis + - REDIS_CACHE_PORT=6379 - SECRET_KEY=${SECRET_KEY} volumes: - netbox-media:/opt/netbox/netbox/media @@ -82,7 +91,9 @@ services: container_name: netbox-housekeeping depends_on: - netbox - command: /opt/netbox/housekeeping.sh + command: /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping + env_file: + - netbox.env environment: - DB_HOST=postgresql.taila5ad8.ts.net - DB_PORT=5432 @@ -91,6 +102,8 @@ services: - DB_PASSWORD=${DB_PASSWORD} - REDIS_HOST=redis - REDIS_PORT=6379 + - REDIS_CACHE_HOST=redis + - REDIS_CACHE_PORT=6379 - SECRET_KEY=${SECRET_KEY} restart: unless-stopped