Merge pull request #9 from ivylikethevine/bugfix/network-cleanup

minor cleanup

Author: ivylikethevine

compose.yaml

@@ -1,4 +1,5 @@
-version: '3.8'
+---
+
 services:
   dockge:
     image: louislam/dockge:latest
@@ -13,4 +14,4 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /containers/dockge/data:/app/data
       - /home/$USER/saffron/stacks:/home/$USER/saffron/stacks
-      - /etc/timezone:/etc/timezone:ro
+      - /etc/timezone:/etc/timezone:ro

stacks/dozzle/compose.yaml

@@ -3,16 +3,16 @@ services:
   dozzle:
     container_name: dozzle
     image: amir20/dozzle:latest
+    restart: always
+    extends:
+      file: ../common.yaml
+      service: base-settings
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
       - 9999:8080
     environment:
       DOZZLE_NO_ANALYTICS: true
-    extends:
-      file: ../common.yaml
-      service: base-settings
-    restart: always
     networks:
       - saffron_default
 networks:

stacks/duplicati/compose.yaml

@@ -4,11 +4,11 @@ services:
     image: linuxserver/duplicati:latest
     container_name: duplicati
     restart: always
-    entrypoint:
-      - /init
     extends:
       file: ../common.yaml
       service: media-access
+    entrypoint:
+      - /init
     ports:
       - 8200:8200/tcp
     environment:
@@ -17,4 +17,8 @@ services:
     volumes:
       - /containers/duplicati/config:/config
     ipc: private
-networks: {}
+    networks:
+      - saffron_default
+networks:
+  saffron_default:
+    external: true

stacks/esphome/compose.yaml

@@ -3,12 +3,12 @@ services:
     image: esphome/esphome:latest
     container_name: esphome
     restart: unless-stopped
+    extends:
+      file: ../common.yaml
+      service: base-settings
     volumes:
       - /containers/esphome/config:/config
     ports:
       - 6052:6052
-    extends:
-      file: ../common.yaml
-      service: base-settings
     privileged: true
 networks: {}

stacks/heimdall/compose.yaml

@@ -4,14 +4,14 @@ services:
     image: linuxserver/heimdall
     container_name: heimdall
     restart: always
+    extends:
+      file: ../common.yaml
+      service: base-settings
     ports:
       - 80:80
       - 443:443
     volumes:
       - /containers/heimdall:/config
-    extends:
-      file: ../common.yaml
-      service: base-settings
     networks:
       - saffron_default
 networks:

stacks/it-tools/compose.yaml

@@ -2,12 +2,12 @@ version: "3.3"
 services:
   it-tools:
     container_name: it-tools
+    image: corentinth/it-tools:latest
+    restart: always
     ports:
       - 8099:80
-    image: corentinth/it-tools:latest
     networks:
       - saffron_default
-    restart: always
 networks:
   saffron_default:
     external: true

stacks/metube/compose.yaml

@@ -8,11 +8,11 @@ services:
       - 8280:8081
     volumes:
       - /data/metube:/downloads
-    networks:
-      - saffron_default
     extends:
       file: ../common.yaml
       service: media-access
+    networks:
+      - saffron_default
 networks:
   saffron_default:
     external: true

stacks/octoprint/compose.yaml

@@ -12,4 +12,8 @@ services:
     extends:
       file: ../common.yaml
       service: base-settings
-networks: {}
+    networks:
+      - saffron_default
+networks:
+  saffron_default:
+    external: true

stacks/uptime-kuma/compose.yaml

@@ -3,11 +3,11 @@ services:
     image: louislam/uptime-kuma:latest
     container_name: uptime-kuma
     restart: always
-    ports:
-      - 3001:3001
     extends:
       file: ../common.yaml
       service: base-settings
+    ports:
+      - 3001:3001
     volumes:
       - /containers/uptime-kuma/data:/app/data
     networks:

stacks/ustreamer/compose.yaml

@@ -4,7 +4,12 @@ services:
     container_name: ustreamer
     restart: always
     devices:
-      - /dev/video3:/dev/video0
+      - /dev/video0:/dev/video0
     ports:
-      - 8080:8080
-    command: ustreamer --device /dev/video0 -b 32 -w 32 -r 1280x720 -q 60
+      - 8083:8080
+    command: ustreamer --device /dev/video0 -b 32 -w 32 -r 1280x720 -q 60
+    networks:
+      - saffron_default
+networks:
+  saffron_default:
+    external: true