From 778e5f2f6bcf01a4394ac0d2079a47e864d38b58 Mon Sep 17 00:00:00 2001 From: Vishesh 'ironeagle' Bangotra Date: Tue, 21 Oct 2025 16:22:21 +0530 Subject: [PATCH 1/4] moving mounts to omnissiah-mounts --- docker-compose.yaml | 56 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 808cac6..92b89ad 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,3 +1,48 @@ +# Service-specific volume configurations +x-volume-configs: + gitea: &gitea_volumes + - type: bind + source: /mnt/omnissiah-vault/configs/gitea + target: /data + bind: + create_host_path: true + + drone: &drone_volumes + - type: bind + source: /mnt/omnissiah-vault/configs/drone + target: /data + bind: + create_host_path: true + - type: bind + source: /mnt/omnissiah-vault/configs/certs + target: /usr/local/share/ca-certificates:ro + bind: + create_host_path: true + + registry: ®istry_volumes + - type: bind + source: /mnt/omnissiah-vault/data/registry + target: /var/lib/registry + bind: + create_host_path: true + - type: bind + source: /mnt/omnissiah-vault/configs/auth + target: /auth:ro + bind: + create_host_path: true + - type: bind + source: ./registry/config.yml + target: /etc/docker/registry/config.yml:ro + bind: + create_host_path: true + + registry_ui: ®istry_ui_volumes + - type: bind + source: /mnt/omnissiah-vault/configs/auth + target: /auth:ro + bind: + create_host_path: true + services: registry-ui: image: joxit/docker-registry-ui:latest @@ -5,7 +50,7 @@ services: ports: - "6001:80" volumes: - - /home/aetos/registry/auth:/auth:ro + - *registry_ui_volumes environment: REGISTRY_TITLE: "Armory of the Codex" REGISTRY_URL: https://dcr.aetoskia.com @@ -32,7 +77,7 @@ services: - "6002:3000" # Web UI - "222:22" # SSH volumes: - - /home/aetos/gitea:/data + - *gitea_volumes extra_hosts: - "drone.aetoskia.com:192.168.1.111" profiles: @@ -44,8 +89,7 @@ services: ports: - "6003:80" # Drone UI/API available on https://localhost:6003 volumes: - - /home/aetos/drone:/data - - /home/aetos/certs:/usr/local/share/ca-certificates:ro + - *drone_volumes environment: DRONE_GITEA_CLIENT_ID: 8445594d-7c03-41a1-b66d-4296f34fa644 DRONE_GITEA_CLIENT_SECRET: gto_f46d6utmlttauajdjxpfgikskb3j5epoohzhpp2r6j2jbed46iaq @@ -89,9 +133,7 @@ services: ports: - "6005:5000" volumes: - - /home/aetos/registry:/var/lib/registry - - /home/aetos/registry/auth:/auth:ro - - ./registry/config.yml:/etc/docker/registry/config.yml:ro + - *registry_volumes environment: REGISTRY_AUTH: htpasswd REGISTRY_AUTH_HTPASSWD_REALM: "Registry Realm" -- 2.49.1 From 3567448ec15a54fa8c719a39646079a1b2c67e34 Mon Sep 17 00:00:00 2001 From: Vishesh 'ironeagle' Bangotra Date: Tue, 21 Oct 2025 16:34:11 +0530 Subject: [PATCH 2/4] fixes --- docker-compose.yaml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 92b89ad..df3ff2a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -49,8 +49,7 @@ services: container_name: registry-ui ports: - "6001:80" - volumes: - - *registry_ui_volumes + volumes: *registry_ui_volumes environment: REGISTRY_TITLE: "Armory of the Codex" REGISTRY_URL: https://dcr.aetoskia.com @@ -63,8 +62,6 @@ services: restart: always extra_hosts: - "dcr.aetoskia.com:192.168.1.111" - profiles: - - private-pi gitea: image: gitea/gitea:latest @@ -76,20 +73,16 @@ services: ports: - "6002:3000" # Web UI - "222:22" # SSH - volumes: - - *gitea_volumes + volumes: *gitea_volumes extra_hosts: - "drone.aetoskia.com:192.168.1.111" - profiles: - - private-pi drone-server: image: drone/drone:2 container_name: drone-server ports: - "6003:80" # Drone UI/API available on https://localhost:6003 - volumes: - - *drone_volumes + volumes: *drone_volumes environment: DRONE_GITEA_CLIENT_ID: 8445594d-7c03-41a1-b66d-4296f34fa644 DRONE_GITEA_CLIENT_SECRET: gto_f46d6utmlttauajdjxpfgikskb3j5epoohzhpp2r6j2jbed46iaq @@ -103,8 +96,6 @@ services: extra_hosts: - "gitea.aetoskia.com:192.168.1.111" command: sh -c "update-ca-certificates && drone-server" - profiles: - - private-pi drone-runner: image: drone/drone-runner-docker:latest @@ -123,21 +114,17 @@ services: DRONE_LOGS_DEBUG: true DRONE_LOGS_TRACE: true extra_hosts: + - "server-pi:192.168.1.35" - "private-pi:192.168.1.111" - profiles: - - server-pi registry: image: registry:2 container_name: registry ports: - "6005:5000" - volumes: - - *registry_volumes + volumes: *registry_volumes environment: REGISTRY_AUTH: htpasswd REGISTRY_AUTH_HTPASSWD_REALM: "Registry Realm" REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd restart: always - profiles: - - private-pi -- 2.49.1 From 8e5c9cd4dcd1e535d6057452898a4870474452f5 Mon Sep 17 00:00:00 2001 From: Aetos Skia Date: Tue, 21 Oct 2025 16:55:35 +0530 Subject: [PATCH 3/4] fixes for ro mounts --- docker-compose.yaml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index df3ff2a..ef7e13b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,40 +8,25 @@ x-volume-configs: create_host_path: true drone: &drone_volumes + - /mnt/omnissiah-vault/configs/certs:/usr/local/share/ca-certificates:ro - type: bind source: /mnt/omnissiah-vault/configs/drone target: /data bind: create_host_path: true - - type: bind - source: /mnt/omnissiah-vault/configs/certs - target: /usr/local/share/ca-certificates:ro - bind: - create_host_path: true registry: ®istry_volumes + - ./registry/config.yml:/etc/docker/registry/config.yml:ro + + - /mnt/omnissiah-vault/configs/auth:/auth:ro - type: bind source: /mnt/omnissiah-vault/data/registry target: /var/lib/registry bind: create_host_path: true - - type: bind - source: /mnt/omnissiah-vault/configs/auth - target: /auth:ro - bind: - create_host_path: true - - type: bind - source: ./registry/config.yml - target: /etc/docker/registry/config.yml:ro - bind: - create_host_path: true registry_ui: ®istry_ui_volumes - - type: bind - source: /mnt/omnissiah-vault/configs/auth - target: /auth:ro - bind: - create_host_path: true + - /mnt/omnissiah-vault/configs/auth:/auth:ro services: registry-ui: -- 2.49.1 From aa02abb85bd42e34912556dffa0899b6b87ca70e Mon Sep 17 00:00:00 2001 From: Vishesh 'ironeagle' Bangotra Date: Tue, 21 Oct 2025 17:28:11 +0530 Subject: [PATCH 4/4] profiles --- docker-compose.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index ef7e13b..99ccd1d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -47,6 +47,8 @@ services: restart: always extra_hosts: - "dcr.aetoskia.com:192.168.1.111" + profiles: + - server-pi gitea: image: gitea/gitea:latest @@ -61,6 +63,8 @@ services: volumes: *gitea_volumes extra_hosts: - "drone.aetoskia.com:192.168.1.111" + profiles: + - private-pi drone-server: image: drone/drone:2 @@ -81,11 +85,14 @@ services: extra_hosts: - "gitea.aetoskia.com:192.168.1.111" command: sh -c "update-ca-certificates && drone-server" + profiles: + - server-pi drone-runner: image: drone/drone-runner-docker:latest container_name: drone-runner restart: always + network_mode: host volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -101,6 +108,8 @@ services: extra_hosts: - "server-pi:192.168.1.35" - "private-pi:192.168.1.111" + profiles: + - server-pi registry: image: registry:2 @@ -113,3 +122,5 @@ services: REGISTRY_AUTH_HTPASSWD_REALM: "Registry Realm" REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd restart: always + profiles: + - server-pi -- 2.49.1