profiles

docker-compose.yaml

@@ -1,11 +1,40 @@
+# 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
+    - /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
+
+  registry: &registry_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
+
+  registry_ui: &registry_ui_volumes
+    - /mnt/omnissiah-vault/configs/auth:/auth:ro
+
 services:
   registry-ui:
     image: joxit/docker-registry-ui:latest
     container_name: registry-ui
     ports:
       - "6001:80"
-    volumes:
+    volumes: *registry_ui_volumes
-      - /home/aetos/registry/auth:/auth:ro
     environment:
       REGISTRY_TITLE: "Armory of the Codex"
       REGISTRY_URL: https://dcr.aetoskia.com
@@ -19,7 +48,7 @@ services:
     extra_hosts:
       - "dcr.aetoskia.com:192.168.1.111"
     profiles:
-      - private-pi
+      - server-pi
 
   gitea:
     image: gitea/gitea:latest
@@ -31,8 +60,7 @@ services:
     ports:
       - "6002:3000"  # Web UI
       - "222:22"     # SSH
-    volumes:
+    volumes: *gitea_volumes
-      - /home/aetos/gitea:/data
     extra_hosts:
       - "drone.aetoskia.com:192.168.1.111"
     profiles:
@@ -43,9 +71,7 @@ services:
     container_name: drone-server
     ports:
       - "6003:80"   # Drone UI/API available on https://localhost:6003
-    volumes:
+    volumes: *drone_volumes
-      - /home/aetos/drone:/data
-      - /home/aetos/certs:/usr/local/share/ca-certificates:ro
     environment:
       DRONE_GITEA_CLIENT_ID: 8445594d-7c03-41a1-b66d-4296f34fa644
       DRONE_GITEA_CLIENT_SECRET: gto_f46d6utmlttauajdjxpfgikskb3j5epoohzhpp2r6j2jbed46iaq
@@ -60,12 +86,13 @@ services:
       - "gitea.aetoskia.com:192.168.1.111"
     command: sh -c "update-ca-certificates && drone-server"
     profiles:
-      - private-pi
+      - 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:
@@ -79,6 +106,7 @@ 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
@@ -88,14 +116,11 @@ services:
     container_name: registry
     ports:
       - "6005:5000"
-    volumes:
+    volumes: *registry_volumes
-      - /home/aetos/registry:/var/lib/registry
-      - /home/aetos/registry/auth:/auth:ro
-      - ./registry/config.yml:/etc/docker/registry/config.yml:ro
     environment:
       REGISTRY_AUTH: htpasswd
       REGISTRY_AUTH_HTPASSWD_REALM: "Registry Realm"
       REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
     restart: always
     profiles:
-      - private-pi
+      - server-pi