docker-compose.override.yml

@@ -1,63 +0,0 @@
-services:
-  netbox:
-    networks:
-      - caddy
-      - netbox
-    ports:
-      - 8000:8080
-    configs:
-      - source: configuration.py
-        target: /etc/netbox/config/configuration.py
-      - source: ldap_config.py
-        target: /etc/netbox/config/ldap/ldap_config.py
-    secrets:
-      - source: netbox.superuser.pwd
-        target: superuser_password
-      - source: netbox.db.pwd
-        target: db_password
-      - source: netbox.secretkey
-        target: secret_key
-      - source: netbox.redis.pwd
-        target: redis_password
-      - source: netbox.redis.pwd
-        target: redis_cache_password
-        
-  netbox-worker:
-    restart: unless-stopped
-    networks:
-      - netbox
-  netbox-housekeeping:
-    restart: unless-stopped
-    networks:
-      - netbox
-  redis:
-    restart: unless-stopped
-    networks:
-      - netbox
-  redis-cache:
-    restart: unless-stopped
-    networks:
-      - netbox
-
-secrets:
-  netbox.superuser.pwd:
-    external: true
-  netbox.db.pwd:
-    external: true
-  netbox.secretkey:
-    external: true
-  netbox.redis.pwd:
-    external: true
-
-networks:
-  caddy:
-    external: true
-  netbox:
-  
-configs:
-  configuration.py:
-    external: true
-    name: netbox-configuration.py-v0
-  ldap_config.py:
-    external: true
-    name: netbox-ldap_config.py-v0

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   netbox: &netbox
     image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.1}
     depends_on:
-#    - postgres
+    - postgres
     - redis
     - redis-cache
     env_file: env/netbox.env
@@ -13,14 +13,15 @@ services:
       interval: 15s
       test: "curl -f http://localhost:8080/login/ || exit 1"
     volumes:
-#    - ./configuration:/etc/netbox/config:z,ro
+    - ./configuration:/etc/netbox/config:z,ro
     - netbox-media-files:/opt/netbox/netbox/media:rw
     - netbox-reports-files:/opt/netbox/netbox/reports:rw
     - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
   netbox-worker:
     <<: *netbox
     depends_on:
-      - netbox
+      netbox:
+        condition: service_healthy
     command:
     - /opt/netbox/venv/bin/python
     - /opt/netbox/netbox/manage.py
@@ -33,7 +34,8 @@ services:
   netbox-housekeeping:
     <<: *netbox
     depends_on:
-      - netbox
+      netbox:
+        condition: service_healthy
     command:
     - /opt/netbox/housekeeping.sh
     healthcheck:
@@ -43,11 +45,11 @@ services:
       test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1"
 
   # postgres
-#  postgres:
-#    image: docker.io/postgres:16-alpine
-#    env_file: env/postgres.env
-#    volumes:
-#    - netbox-postgres-data:/var/lib/postgresql/data
+  postgres:
+    image: docker.io/postgres:16-alpine
+    env_file: env/postgres.env
+    volumes:
+    - netbox-postgres-data:/var/lib/postgresql/data
 
   # redis
   redis:
@@ -72,8 +74,8 @@ services:
 volumes:
   netbox-media-files:
     driver: local
-#  netbox-postgres-data:
-#    driver: local
+  netbox-postgres-data:
+    driver: local
   netbox-redis-cache-data:
     driver: local
   netbox-redis-data: