Improve the format of the docker files

This commit is contained in:
Manuel Thalmann 2024-11-27 02:59:07 +01:00
parent 9a3d7d4f68
commit 38d8eeedde
6 changed files with 10 additions and 11 deletions

View file

@ -4,7 +4,6 @@ services:
restart: unless-stopped restart: unless-stopped
user: 1337:1337 user: 1337:1337
hostname: Jellyfin hostname: Jellyfin
environment: {}
volumes: volumes:
- ./config/jellyfin:/config - ./config/jellyfin:/config
- cache:/cache - cache:/cache
@ -96,9 +95,9 @@ services:
-o directory.default.set=/downloads -o directory.default.set=/downloads
-o 'method.set=group.seeding.ratio.command, "d.cloase = ; d.erase = "' -o 'method.set=group.seeding.ratio.command, "d.cloase = ; d.erase = "'
volumes: volumes:
- /etc/localtime:/etc/localtime:ro
- ./config/rtorrent:/config - ./config/rtorrent:/config
- ./downloads:/downloads - ./downloads:/downloads
- /etc/localtime:/etc/localtime:ro
- ./proton:/proton - ./proton:/proton
devices: devices:
- /dev/net/tun - /dev/net/tun

View file

@ -1,5 +1,6 @@
services: services:
jellyfin: jellyfin:
environment: {}
ports: ports:
- 127.0.0.1:1337:8096 - 127.0.0.1:1337:8096
radarr: radarr:

View file

@ -1,12 +1,12 @@
services: services:
game: game:
command:
- /game_settings=MatchSettings/Nations/NationsBlue.txt
environment: {}
ports: ports:
- 2350:2350 - 2350:2350
- 2350:2350/udp - 2350:2350/udp
- 2353:2353 - 2353:2353
- 2353:2353/udp - 2353:2353/udp
command:
- /game_settings=MatchSettings/Nations/NationsBlue.txt
environment: {}
xaseco: xaseco:
environment: {} environment: {}

View file

@ -3,10 +3,9 @@ services:
image: vaultwarden/server image: vaultwarden/server
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./data:/data
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ./data/vault:/data
environment: environment:
DOMAIN: null
SMTP_HOST: bridge SMTP_HOST: bridge
SMTP_FROM: null SMTP_FROM: null
SMTP_FROM_VALUE: vaultwarden SMTP_FROM_VALUE: vaultwarden
@ -18,8 +17,8 @@ services:
image: mariadb image: mariadb
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./db:/var/lib/mysql
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ./data/db:/var/lib/mysql
environment: environment:
MARIADB_RANDOM_ROOT_PASSWORD: "yes" MARIADB_RANDOM_ROOT_PASSWORD: "yes"
bridge: bridge:

View file

@ -74,8 +74,8 @@ begin
ENTRY="./data/$name/db:/var/lib/mysql" yq "$dbKey.volumes |= . + [ env(ENTRY) ]" | \ ENTRY="./data/$name/db:/var/lib/mysql" yq "$dbKey.volumes |= . + [ env(ENTRY) ]" | \
sudo tee "$config" >/dev/null 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)" "$tmpOverrides" | \
HOST="https://$domain" yq "$ciEnv.WOODPECKER_HOST = env(HOST)" | \ 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)" | \ DB="$dbUser:$pw@tcp($dbName:3306)/$db?parseTime=true" yq "$ciEnv.WOODPECKER_DATABASE_DATASOURCE = env(DB)" | \
USER="$dbUser" yq "$dbEnv.MARIADB_USER = env(USER)" | \ USER="$dbUser" yq "$dbEnv.MARIADB_USER = env(USER)" | \
PW="$pw" yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \ PW="$pw" yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \