Load enabled services from machine config

scripts/Common/Software/docker/services/docker-compose.yml

@@ -2,4 +2,3 @@ include:
   - path:
     - docker-compose.base.yml
     - docker-compose.secrets.yml
-    - docker-compose.overrides.yml

scripts/Common/Software/docker/services/drone/docker-compose.core.yml

@@ -1,23 +0,0 @@
-services:
-  ci:
-    build:
-      context: .
-      dockerfile: ci.Dockerfile
-    restart: unless-stopped
-    env_file:
-      - server.common.env
-  docker:
-    image: drone/drone-runner-docker
-    restart: unless-stopped
-    env_file: runner.common.env
-    environment:
-      DRONE_RUNNER_NAME: docker-runner
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-  ssh:
-    image: drone/drone-runner-ssh
-    restart: unless-stopped
-    env_file:
-      - runner.common.env
-    environment:
-      DRONE_RUNNER_NAME: ssh-runner

scripts/Common/Software/docker/services/drone/docker-compose.templates.yml

@@ -1,19 +1,26 @@
 services:
   ci-template:
-    extends:
-      file: docker-compose.core.yml
-      service: ci
-    env_file: []
-    environment: {}
+    build:
+      context: .
+      dockerfile: ci.Dockerfile
+    restart: unless-stopped
+    env_file:
+      - server.common.env
   docker-template:
-    extends:
-      file: docker-compose.core.yml
-      service: docker
+    image: drone/drone-runner-docker
+    restart: unless-stopped
     depends_on: []
-    env_file: []
+    env_file:
+      - runner.common.env
+    environment:
+      DRONE_RUNNER_NAME: docker-runner
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
   ssh-template:
-    extends:
-      file: docker-compose.core.yml
-      service: ssh
+    image: drone/drone-runner-ssh
+    restart: unless-stopped
     depends_on: []
-    env_file: []
+    env_file:
+      - runner.common.env
+    environment:
+      DRONE_RUNNER_NAME: ssh-runner

scripts/Common/Software/docker/services/drone/main.fish

@@ -19,7 +19,7 @@ begin
         echo "{}" | sudo tee "$config" >/dev/null
         echo "{}" | sudo tee "$secrets" >/dev/null
 
-        cp "$dir"/{ci.Dockerfile,docker-compose.core.yml,.dockerignore} "$root"
+        cp "$dir"/{ci.Dockerfile,.dockerignore} "$root"
         echo "DRONE_JSONNET_ENABLED=true" | sudo tee "$root/server.common.env" >/dev/null
         echo "DRONE_RUNNER_CAPACITY=2" | sudo tee "$root/runner.common.env" >/dev/null
 

scripts/Common/Software/docker/services/forgejo/docker-compose.base.yml

@@ -19,7 +19,7 @@ services:
       FORGEJO__actions__ENABLED: "true"
       FORGEJO__openid__ENABLE_OPENID_SIGNUP: "false"
       FORGEJO__cron.git_gc_repos__ENABLED: "true"
-      FORGEJO__cron.gc_lfs__ENABLED: "true"
+      FORGEJO__cron.git_lfs: "true"
     volumes:
       - ./data/forgejo:/data
       - config:/data/gitea/conf
@@ -40,7 +40,7 @@ services:
     image: shenxn/protonmail-bridge
     restart: unless-stopped
     volumes:
-      - ./data/bridge:/root
+      - ./bridge:/root
   runner:
     image: gitea/act_runner
     restart: unless-stopped

scripts/Common/Software/docker/services/forgejo/docker-compose.secrets.yml

@@ -5,4 +5,3 @@ services:
       - 127.0.0.1:1337:3000
       - 127.0.0.1:1338:22
   db: {}
-  runner: {}

scripts/Common/Software/docker/services/forgejo/main.fish

@@ -20,26 +20,22 @@ begin
         initializeServiceInstallation $argv
         sudo cp "$dir/docker-compose.base.yml" "$root"
 
+        installDockerService $argv
         set port (yq (getSSHPortKey) "$source" | mutatePort "$port")
 
         DOMAIN=(getServiceDomain $server) PW=$pw DB=Git USER=forgejo PW=$pw begin
                 set -l gitEnv "$(getServiceKey "$service").environment"
-                set -l actEnv "$(getServiceKey "runner").environment"
                 set -l dbEnv "$(getServiceKey "db").environment"
 
                 PORT=$port yq "$(getSSHPortKey) = env(PORT)" "$source" | \
-                    yq "$gitEnv.FORGEJO__server__DOMAIN = env(DOMAIN)" | \
                     yq "$gitEnv.FORGEJO__database__NAME = env(DB)" | \
                     yq "$gitEnv.FORGEJO__database__USER = env(USER)" | \
                     yq "$gitEnv.FORGEJO__database__PASSWD = env(PW)" | \
                     yq "$dbEnv.MARIADB_DATABASE = env(DB)" | \
                     yq "$dbEnv.MARIADB_USER = env(USER)" | \
                     yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \
-                    URL="https://$DOMAIN/" yq "$actEnv.GITEA_INSTANCE_URL = env(URL)" | \
                     sudo tee "$secrets" >/dev/null
             end
-
-        installDockerService $argv
     end
 
     function configureSW -V dir -V user -V service

scripts/Common/Software/docker/services/jellyfin/main.fish

@@ -59,12 +59,13 @@ begin
 
             and yq "$envKey.PUID = $uid" "$file" | \
                 yq "$envKey.PGID = $gid" | \
+                yq -y . | \
                 sudo tee "$config" >/dev/null
         end
 
-        cp "$secrets" "$file"
+        cp "$config" "$file"
         URL="https://$(getServiceDomain "$domain" "")/" yq "$(getServiceKey "$service").environment.JELLYFIN_PublishedServerUrl = env(URL)" "$file" | \
-            sudo tee "$secrets" >/dev/null
+            sudo tee "$config" >/dev/null
 
         for dir in "$root"/{downloads,config/{,jellyfin,flood,rtorrent,radarr,sonarr,lidarr,prowlarr},media/{,movies,series,music}}
             sudo mkdir -p "$dir"

scripts/Common/Software/docker/services/service.fish

@@ -116,7 +116,6 @@ begin
         sudo mkdir -p (getServiceRoot $argv)
         sudo mkdir -p "$nginxRoot"
         sudo mkdir -p (dirname (getServiceSecretsConfig $argv))
-        sudo touch "$root/docker-compose.overrides.yml"
         sudo cp "$dir/docker-compose.yml" "$root"
     end
 
@@ -173,17 +172,7 @@ begin
         sudo systemctl restart nginx
     end
 
-    function getExtraBackupPatterns
-        echo ""
-    end
-
     function getBackupArgs
-        set -l extraPatterns (getExtraBackupPatterns)
-
-        if [ -n "$extraPatterns" ]
-            set extraPatterns "|$extraPatterns"
-        end
-
-        printf "%s\n" --base-directory (getServiceRoot $argv) --hidden --no-ignore "^(docker-compose\.(secrets|overrides)\.yml|data)\$$extraPatterns"
+        printf "%s\n" --base-directory (getServiceRoot $argv) --hidden --no-ignore "^(docker-compose\.secrets\.yml|data)\$"
     end
 end