chore: layout changes

forgejo/docker-compose.yml

@@ -13,12 +13,13 @@
 #       as a shared secret.
 #
 # Replace {ROOT_PASSWORD} with a secure password
+
 services:
   # https://code.forgejo.org/forgejo/runner/src/branch/main/examples/docker-compose
   docker-in-docker:
     image: docker:dind
-    privileged: true
     command: ["dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false"]
+    privileged: true
 
   forgejo:
     image: codeberg.org/forgejo/forgejo:1.21
@@ -40,19 +41,27 @@ services:
     volumes:
       - ./volumes/forgejo-data:/data
     ports:
-      - 127.0.0.1:13000:3000
+      - "127.0.0.1:13000:3000"
 
-  runner-register:
+  runner-daemon:
     image: code.forgejo.org/forgejo/runner:3.3.0
-    container_name: forgejo_runner
+    container_name: forgejo_runner_daemon
-    links:
+    command: "forgejo-runner --config config.yml daemon"
-      - docker-in-docker
-      - forgejo
     environment:
       DOCKER_HOST: tcp://docker-in-docker:2375
     volumes:
       - ./volumes/runner-data:/data
-    user: 0:0
+    links:
+      - docker-in-docker
+      - forgejo
+    depends_on:
+      runner-register:
+        condition: service_completed_successfully
+
+  # runner-register needs only to run at first startup
+  runner-register:
+    image: code.forgejo.org/forgejo/runner:3.3.0
+    container_name: forgejo_runner
     command: >-
       bash -ec '
       while : ; do
@@ -64,18 +73,11 @@ services:
       sed -i -e "s|labels: \[\]|labels: \[\"docker:docker://alpine:3.18\"\]|" config.yml ;
       chown -R 1000:1000 /data
       '
-
+    environment:
-  runner-daemon:
+      DOCKER_HOST: tcp://docker-in-docker:2375
-    image: code.forgejo.org/forgejo/runner:3.3.0
+    volumes:
-    container_name: forgejo_runner_daemon
+      - ./volumes/runner-data:/data
+    user: 0:0
     links:
       - docker-in-docker
       - forgejo
-    environment:
-      DOCKER_HOST: tcp://docker-in-docker:2375
-    depends_on:
-      runner-register:
-        condition: service_completed_successfully
-    volumes:
-      - ./volumes/runner-data:/data
-    command: "forgejo-runner --config config.yml daemon"

home_stack/docker-compose.yml

@@ -3,26 +3,26 @@ services:
   homeassistant:
     image: ghcr.io/home-assistant/home-assistant:stable
     container_name: homeassistant
+    environment:
+      - TZ=Europe/Berlin
     volumes:
       - ./volumes/homeassistant/config:/config
       - /etc/localtime:/etc/localtime:ro
-    environment:
-      - TZ=Europe/Berlin
     network_mode: host
     restart: unless-stopped
 
   zigbee2mqtt:
     image: koenkk/zigbee2mqtt
     container_name: zigbee2mqtt
-    group_add:
+    environment:
-      - dialout
+      - TZ=Europe/Berlin
     ports:
       - "127.0.0.1:38080:8080"
     volumes:
       - ./volumes/zigbee2mqtt/data:/app/data
       - /run/udev:/run/udev:ro
-    environment:
+    group_add:
-      - TZ=Europe/Berlin
+      - dialout
     devices:
       # Make sure this matched your adapter location
       - /dev/ttyACM0:/dev/ttyACM0
@@ -32,12 +32,12 @@ services:
     image: eclipse-mosquitto:2.0
     container_name: mqtt
     command: "mosquitto -c /mosquitto-no-auth.conf"
+    environment:
+      - TZ=Europe/Berlin
     ports:
       - "127.0.0.1:1883:1883"
     volumes:
       - ./volumes/mosquitto/conf:/mosquitto/conf
       - ./volumes/mosquitto/data:/mosquitto/data
       - ./volumes/mosquitto/logs:/mosquitto/log
-    environment:
-      - TZ=Europe/Berlin
     restart: unless-stopped

ntfy/docker-compose.yml

@@ -1,13 +1,12 @@
 ---
 services:
   ntfy:
-    # https://docs.ntfy.sh/install/#docker
     image: binwiederhier/ntfy
     container_name: ntfy
     command:
       - serve
     environment:
-      TZ: Europe/Berlin    # optional: set desired timezone
+      TZ: Europe/Berlin
       # user: UID:GID         # optional: replace with your own user/group or uid/gid
     volumes:
       - ./volumes/cache:/var/cache/ntfy

template/README.md

@@ -0,0 +1,14 @@
+# APP_STACK
+
+- [APP\_STACK](#app_stack)
+  - [Directory structure](#directory-structure)
+  - [Settings](#settings)
+
+
+## Directory structure
+```
+/opt/docker/app_stack
+.
+```
+
+## Settings

template/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-name: app_stack
 services:
   foo:
     image:
@@ -10,6 +9,7 @@ services:
     ports:
     volumes:
     depends_on:
+    healthcheck:
     restart: unless-stopped
 
   bar:

vaultwarden/docker-compose.yml

@@ -3,10 +3,6 @@ services:
   vaultwarden:
     image: vaultwarden/server:latest
     container_name: vaultwarden
-    ports:
-      - "127.0.0.1:11080:80"
-    volumes:
-      - ./volumes/data:/data
     environment:
       SIGNUPS_ALLOWED: 'false'       # set to false to disable signups
       INVITATIONS_ALLOWED: 'false'  # set to false to disable invitations
@@ -17,4 +13,8 @@ services:
       ICON_SERVICE: 'internal'
       DISABLE_ICON_DOWNLOAD: 'true'
       # LOG_LEVEL: 'debug'
+    volumes:
+      - ./volumes/data:/data
+    ports:
+      - "127.0.0.1:11080:80"
     restart: unless-stopped