From 0a59700a5d033039bd56988a67f7ceb1ecda0dae Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 27 Nov 2024 02:59:07 +0100
Subject: [PATCH] Improve the format of the docker files

---
 .../docker/services/jellyfin/docker-compose.base.yml        | 3 +--
 .../docker/services/jellyfin/docker-compose.overrides.yml   | 1 +
 .../docker/services/nextcloud/docker-compose.base.yml       | 2 +-
 .../docker/services/trackmania/docker-compose.overrides.yml | 6 +++---
 .../docker/services/vaultwarden/docker-compose.base.yml     | 5 ++---
 .../Common/Software/docker/services/woodpecker/main.fish    | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
index fdb69629..8c54d6aa 100644
--- a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
@@ -4,7 +4,6 @@ services:
     restart: unless-stopped
     user: 1337:1337
     hostname: Jellyfin
-    environment: {}
     volumes:
       - ./config/jellyfin:/config
       - cache:/cache
@@ -96,9 +95,9 @@ services:
              -o directory.default.set=/downloads
              -o 'method.set=group.seeding.ratio.command, "d.cloase = ; d.erase = "'
     volumes:
+      - /etc/localtime:/etc/localtime:ro
       - ./config/rtorrent:/config
       - ./downloads:/downloads
-      - /etc/localtime:/etc/localtime:ro
       - ./proton:/proton
     devices:
       - /dev/net/tun
diff --git a/scripts/Common/Software/docker/services/jellyfin/docker-compose.overrides.yml b/scripts/Common/Software/docker/services/jellyfin/docker-compose.overrides.yml
index 8aa3570d..f735895d 100644
--- a/scripts/Common/Software/docker/services/jellyfin/docker-compose.overrides.yml
+++ b/scripts/Common/Software/docker/services/jellyfin/docker-compose.overrides.yml
@@ -1,5 +1,6 @@
 services:
   jellyfin:
+    environment: {}
     ports:
       - 127.0.0.1:1337:8096
   radarr:
diff --git a/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml b/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
index 4efcb8e7..5d02db25 100644
--- a/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
@@ -19,7 +19,7 @@ services:
     entrypoint:
       - bash
       - -c
-      - /entrypoint.sh php-fpm & while ! echo '' 2> /dev/null > /dev/tcp/127.0.0.1/9000; do sleep 1; done; kill -9 $!; true;
+      - /entrypoint.sh php-fpm & while ! echo '' 2>/dev/null >/dev/tcp/127.0.0.1/9000; do sleep 1; done; kill -9 $!; true;
   db:
     image: mariadb:lts
     restart: unless-stopped
diff --git a/scripts/Common/Software/docker/services/trackmania/docker-compose.overrides.yml b/scripts/Common/Software/docker/services/trackmania/docker-compose.overrides.yml
index 69bb5c3f..92176e7e 100644
--- a/scripts/Common/Software/docker/services/trackmania/docker-compose.overrides.yml
+++ b/scripts/Common/Software/docker/services/trackmania/docker-compose.overrides.yml
@@ -1,12 +1,12 @@
 services:
   game:
+    command:
+      - /game_settings=MatchSettings/Nations/NationsBlue.txt
+    environment: {}
     ports:
       - 2350:2350
       - 2350:2350/udp
       - 2353:2353
       - 2353:2353/udp
-    command:
-      - /game_settings=MatchSettings/Nations/NationsBlue.txt
-    environment: {}
   xaseco:
     environment: {}
diff --git a/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml b/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
index 157dc522..e8059cab 100644
--- a/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
@@ -3,10 +3,9 @@ services:
     image: vaultwarden/server
     restart: unless-stopped
     volumes:
-      - ./data:/data
       - /etc/localtime:/etc/localtime:ro
+      - ./data/vault:/data
     environment:
-      DOMAIN: null
       SMTP_HOST: bridge
       SMTP_FROM: null
       SMTP_FROM_VALUE: vaultwarden
@@ -18,8 +17,8 @@ services:
     image: mariadb
     restart: unless-stopped
     volumes:
-      - ./db:/var/lib/mysql
       - /etc/localtime:/etc/localtime:ro
+      - ./data/db:/var/lib/mysql
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: "yes"
   bridge:
diff --git a/scripts/Common/Software/docker/services/woodpecker/main.fish b/scripts/Common/Software/docker/services/woodpecker/main.fish
index 7acc24c9..e66625e9 100755
--- a/scripts/Common/Software/docker/services/woodpecker/main.fish
+++ b/scripts/Common/Software/docker/services/woodpecker/main.fish
@@ -74,8 +74,8 @@ begin
                     ENTRY="./data/$name/db:/var/lib/mysql" yq "$dbKey.volumes |= . + [ env(ENTRY) ]" | \
                     sudo tee "$config" >/dev/null
 
-                PORT="127.0.0.1:1337:8000" yq "$ciKey.ports = [ env(PORT) ]" "$tmpOverrides" | \
-                    HOST="https://$domain" yq "$ciEnv.WOODPECKER_HOST = env(HOST)" | \
+                HOST="https://$domain" yq "$ciEnv.WOODPECKER_HOST = env(HOST)" "$tmpOverrides" | \
+                    PORT="127.0.0.1:1337:8000" yq "$ciKey.ports = [ env(PORT) ]" | \
                     DB="$dbUser:$pw@tcp($dbName:3306)/$db?parseTime=true" yq "$ciEnv.WOODPECKER_DATABASE_DATASOURCE = env(DB)" | \
                     USER="$dbUser" yq "$dbEnv.MARIADB_USER = env(USER)" | \
                     PW="$pw" yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \