From c67fab85c8c100b9910d8b830afd5708c9ac91ab Mon Sep 17 00:00:00 2001 From: sujiba Date: Wed, 8 May 2024 23:01:18 +0200 Subject: [PATCH] chore: layout changes --- forgejo/docker-compose.yml | 42 ++++++++++++++++++---------------- home_stack/docker-compose.yml | 16 ++++++------- ntfy/docker-compose.yml | 3 +-- template/README.md | 14 ++++++++++++ template/docker-compose.yml | 2 +- vaultwarden/docker-compose.yml | 8 +++---- 6 files changed, 50 insertions(+), 35 deletions(-) diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml index d81fcdf..1c18599 100644 --- a/forgejo/docker-compose.yml +++ b/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 - links: - - docker-in-docker - - forgejo + container_name: forgejo_runner_daemon + command: "forgejo-runner --config config.yml daemon" 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 ' - - runner-daemon: - image: code.forgejo.org/forgejo/runner:3.3.0 - container_name: forgejo_runner_daemon + environment: + DOCKER_HOST: tcp://docker-in-docker:2375 + volumes: + - ./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" diff --git a/home_stack/docker-compose.yml b/home_stack/docker-compose.yml index f3887e7..5ebfc08 100644 --- a/home_stack/docker-compose.yml +++ b/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: - - dialout + environment: + - TZ=Europe/Berlin ports: - "127.0.0.1:38080:8080" volumes: - ./volumes/zigbee2mqtt/data:/app/data - /run/udev:/run/udev:ro - environment: - - TZ=Europe/Berlin + group_add: + - 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 diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml index 726b2b4..64a0b57 100644 --- a/ntfy/docker-compose.yml +++ b/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 diff --git a/template/README.md b/template/README.md index e69de29..5176a35 100644 --- a/template/README.md +++ b/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 diff --git a/template/docker-compose.yml b/template/docker-compose.yml index e39aa27..defe4ee 100644 --- a/template/docker-compose.yml +++ b/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: diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index b6b8892..b56049c 100644 --- a/vaultwarden/docker-compose.yml +++ b/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