From c724c6a4567601c73415bfebfb1d031394f319ad Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Thu, 2 Feb 2023 14:09:14 +0200 Subject: [PATCH] Make yaml formatting consistent Signed-off-by: Nikolaos Karaolidis --- authelia/docker-compose.yml | 6 +- code-server/docker-compose.yml | 4 +- commento/docker-compose.yml | 20 +++--- flame/docker-compose.yml | 6 +- gaming/docker-compose.yml | 76 +++++++++++----------- ghost/docker-compose.yml | 8 +-- gitlab/docker-compose.yml | 16 ++--- goaccess/docker-compose.yml | 10 +-- grafana/docker-compose.yml | 4 +- littlelink/docker-compose.yml | 72 ++++++++++----------- matterrmost/docker-compose.yml | 16 ++--- media/docker-compose.yml | 108 ++++++++++++++++---------------- n8n/docker-compose.yml | 38 +++++------ nextcloud/docker-compose.yml | 24 +++---- outline/docker-compose.yml | 80 +++++++++++------------ paperless/docker-compose.yml | 34 +++++----- peercalls/docker-compose.yml | 2 +- routing/docker-compose.yml | 14 ++--- samba/docker-compose.yml | 12 ++-- scrutiny/docker-compose.yml | 12 ++-- tor/docker-compose.yml | 8 +-- transmission/docker-compose.yml | 16 ++--- umami/docker-compose.yml | 8 +-- uptime-kuma/docker-compose.yml | 5 +- vaultwarden/docker-compose.yml | 6 +- vpn/docker-compose.yml | 16 ++--- yourls/docker-compose.yml | 24 +++---- 27 files changed, 324 insertions(+), 321 deletions(-) diff --git a/authelia/docker-compose.yml b/authelia/docker-compose.yml index 31600f8..27151a6 100644 --- a/authelia/docker-compose.yml +++ b/authelia/docker-compose.yml @@ -17,9 +17,9 @@ services: image: postgres:14 restart: unless-stopped environment: - - POSTGRES_USER=authelia - - POSTGRES_PASSWORD=authelia - - POSTGRES_DB=authelia + POSTGRES_USER: authelia + POSTGRES_PASSWORD: authelia + POSTGRES_DB: authelia volumes: - /home/nick/configs/authelia/db:/var/lib/postgresql/data user: 1000:1000 diff --git a/code-server/docker-compose.yml b/code-server/docker-compose.yml index b4508c6..09f8c4b 100644 --- a/code-server/docker-compose.yml +++ b/code-server/docker-compose.yml @@ -5,7 +5,7 @@ services: image: codercom/code-server restart: unless-stopped environment: - - DOCKER_USER=nick + DOCKER_USER: nick volumes: - /home/nick/configs/code-server:/home/coder/.config - /mnt/storage/private/nick/development:/home/coder/dev @@ -13,7 +13,7 @@ services: networks: - default - routing - user: '1000:1000' + user: 1000:1000 networks: routing: diff --git a/commento/docker-compose.yml b/commento/docker-compose.yml index 1f9edfd..998e2b4 100644 --- a/commento/docker-compose.yml +++ b/commento/docker-compose.yml @@ -5,17 +5,17 @@ services: image: caroga/commentoplusplus restart: unless-stopped environment: - COMMENTO_ORIGIN: 'https://stats.karaolidis.com/comments/' - COMMENTO_CDN_PREFIX: 'https://stats.karaolidis.com/comments/' + COMMENTO_ORIGIN: https://stats.karaolidis.com/comments/ + COMMENTO_CDN_PREFIX: https://stats.karaolidis.com/comments/ COMMENTO_PORT: 8080 COMMENTO_POSTGRES: postgres://postgres:postgres@db:5432/commento?sslmode=disable - COMMENTO_SMTP_HOST: '${SMTP_HOST}' - COMMENTO_SMTP_PORT: '${SMTP_PORT}' - COMMENTO_SMTP_USERNAME: '${SMTP_USER}' - COMMENTO_SMTP_PASSWORD: '${SMTP_PASSWORD}' - COMMENTO_SMTP_FROM_ADDRESS: '${SMTP_FROM}' + COMMENTO_SMTP_HOST: ${SMTP_HOST} + COMMENTO_SMTP_PORT: ${SMTP_PORT} + COMMENTO_SMTP_USERNAME: ${SMTP_USER} + COMMENTO_SMTP_PASSWORD: ${SMTP_PASSWORD} + COMMENTO_SMTP_FROM_ADDRESS: ${SMTP_FROM} USE_STARTTLS: true - COMMENTO_FORBID_NEW_OWNERS: 'true' + COMMENTO_FORBID_NEW_OWNERS: true networks: - default - routing @@ -30,8 +30,8 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres volumes: - - '/home/nick/configs/commento:/var/lib/postgresql/data' - user: '1000:1000' + - /home/nick/configs/commento:/var/lib/postgresql/data + user: 1000:1000 networks: routing: diff --git a/flame/docker-compose.yml b/flame/docker-compose.yml index a27ba45..17a4ee8 100644 --- a/flame/docker-compose.yml +++ b/flame/docker-compose.yml @@ -7,9 +7,9 @@ services: volumes: - /home/nick/configs/flame:/app/data environment: - - UID=1000 - - GID=1000 - - PASSWORD=${FLAME_PASSWORD} + UID: 1000 + GID: 1000 + PASSWORD: ${FLAME_PASSWORD} networks: - default - routing diff --git a/gaming/docker-compose.yml b/gaming/docker-compose.yml index f69d8e1..f01cf8a 100644 --- a/gaming/docker-compose.yml +++ b/gaming/docker-compose.yml @@ -5,27 +5,27 @@ services: image: itzg/mc-router restart: unless-stopped ports: - - 25565:25565 + - 25565:25565 command: --mapping='${MC_ROUTER_MAPPING}' mc-gr-varv-paper: image: itzg/minecraft-server:java17-openj9 restart: unless-stopped volumes: - - '/home/nick/configs/gaming/mc-gr-varv-paper:/data' + - /home/nick/configs/gaming/mc-gr-varv-paper:/data environment: - - EULA=TRUE - - TYPE=PAPER - - MEMORY=2G - - MOTD="Ratsistikes apopseis kai postidia" - - DIFFICULTY=normal - - OPS=Nikas36 - - ENABLE_COMMAND_BLOCK=TRUE - - SNOOPER_ENABLED=false - - SPAWN_PROTECTION=0 - - ONLINE_MODE=FALSE - - ALLOW_FLIGHT=TRUE - user: "1000:1000" + EULA: TRUE + TYPE: PAPER + MEMORY: 2G + MOTD: Ratsistikes apopseis kai postidia + DIFFICULTY: normal + OPS: Nikas36 + ENABLE_COMMAND_BLOCK: TRUE + SNOOPER_ENABLED: FALSE + SPAWN_PROTECTION: 0 + ONLINE_MODE: FALSE + ALLOW_FLIGHT: TRUE + user: 1000:1000 tty: true stdin_open: true @@ -33,25 +33,25 @@ services: image: itzg/minecraft-server:java11-openj9 restart: unless-stopped volumes: - - '/home/nick/configs/gaming/mc-priv-ftb:/data' + - /home/nick/configs/gaming/mc-priv-ftb:/data environment: - - TYPE=CURSEFORGE - - CF_SERVER_MOD=ATM6-1.8.19-server.zip - - EULA=TRUE - - SERVER_NAME=All the Mods 6 1.8.19 - 1.6.15 - - DIFFICULTY=normal - - ENABLE_WHITELIST=TRUE - - OPS=Nikas36 - - ENABLE_COMMAND_BLOCK=TRUE - - SPAWN_PROTECTION=0 - - LEVEL_TYPE=BIOMESOPLENTY - - ALLOW_FLIGHT=TRUE - - MEMORY=8G - - STOP_SERVER_ANNOUNCE_DELAY=30 - - TUNE_VIRTUALIZED=TRUE - - ENABLE_ROLLING_LOGS=TRUE - - MAX_TICK_TIME=-1 - user: "1000:1000" + TYPE: CURSEFORGE + CF_SERVER_MOD: ATM6-1.8.19-server.zip + EULA: TRUE + SERVER_NAME: All the Mods 6 1.8.19 - 1.6.15 + DIFFICULTY: normal + ENABLE_WHITELIST: TRUE + OPS: Nikas36 + ENABLE_COMMAND_BLOCK: TRUE + SPAWN_PROTECTION: 0 + LEVEL_TYPE: BIOMESOPLENTY + ALLOW_FLIGHT: TRUE + MEMORY: 8G + STOP_SERVER_ANNOUNCE_DELAY: 30 + TUNE_VIRTUALIZED: TRUE + ENABLE_ROLLING_LOGS: TRUE + MAX_TICK_TIME: -1 + user: 1000:1000 tty: true stdin_open: true @@ -59,12 +59,12 @@ services: image: lmpsrv-custom:0.28.0 restart: unless-stopped volumes: - - '/home/nick/configs/gaming/ksp_0/config:/LMPServer/Config' - - '/home/nick/configs/gaming/ksp_0/universe:/LMPServer/Universe' - - '/home/nick/configs/gaming/ksp_0/plugins:/LMPServer/Plugins' - - '/home/nick/configs/gaming/ksp_0/logs:/LMPServer/logs' - - '/home/nick/configs/gaming/ksp_0/LMPModControl.xml:/LMPServer/LMPModControl.xml' + - /home/nick/configs/gaming/ksp_0/config:/LMPServer/Config + - /home/nick/configs/gaming/ksp_0/universe:/LMPServer/Universe + - /home/nick/configs/gaming/ksp_0/plugins:/LMPServer/Plugins + - /home/nick/configs/gaming/ksp_0/logs:/LMPServer/logs + - /home/nick/configs/gaming/ksp_0/LMPModControl.xml:/LMPServer/LMPModControl.xml ports: - 8800:8800/udp - 8900:8900 - user: "1000:1000" + user: 1000:1000 diff --git a/ghost/docker-compose.yml b/ghost/docker-compose.yml index 1d05a88..7a59691 100644 --- a/ghost/docker-compose.yml +++ b/ghost/docker-compose.yml @@ -5,7 +5,7 @@ services: image: ghost restart: unless-stopped volumes: - - '/home/nick/configs/ghost:/var/lib/ghost/content' + - /home/nick/configs/ghost:/var/lib/ghost/content environment: url: https://blog.karaolidis.com database__client: mysql @@ -18,19 +18,19 @@ services: - routing depends_on: - db - user: '1000:1000' + user: 1000:1000 db: image: mysql restart: unless-stopped volumes: - - '/home/nick/configs/ghost/db:/var/lib/mysql' + - /home/nick/configs/ghost/db:/var/lib/mysql environment: MYSQL_USER: ghost MYSQL_DATABASE: ghost MYSQL_PASSWORD: ghost MYSQL_RANDOM_ROOT_PASSWORD: yes - user: '1000:1000' + user: 1000:1000 networks: routing: diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index 561588a..b13f260 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -6,12 +6,12 @@ services: hostname: git.karaolidis.com restart: unless-stopped volumes: - - '/home/nick/configs/gitlab/config:/etc/gitlab' - - '/home/nick/configs/gitlab/logs:/var/log/gitlab' - - '/home/nick/configs/gitlab/data:/var/opt/gitlab' - - '/home/nick/configs/gitlab/registry:/etc/registry' - - '/home/nick/configs/routing/nginx/certs/letsencrypt/live/karaolidis.com/fullchain.pem:/etc/gitlab/ssl/fullchain.pem:ro' - - '/home/nick/configs/routing/nginx/certs/letsencrypt/live/karaolidis.com/privkey.pem:/etc/gitlab/ssl/privkey.pem:ro' + - /home/nick/configs/gitlab/config:/etc/gitlab + - /home/nick/configs/gitlab/logs:/var/log/gitlab + - /home/nick/configs/gitlab/data:/var/opt/gitlab + - /home/nick/configs/gitlab/registry:/etc/registry + - /home/nick/configs/routing/nginx/certs/letsencrypt/live/karaolidis.com/fullchain.pem:/etc/gitlab/ssl/fullchain.pem:ro + - /home/nick/configs/routing/nginx/certs/letsencrypt/live/karaolidis.com/privkey.pem:/etc/gitlab/ssl/privkey.pem:ro networks: - default - routing @@ -21,8 +21,8 @@ services: image: gitlab/gitlab-runner restart: unless-stopped volumes: - - '/home/nick/configs/gitlab/runner:/etc/gitlab-runner' - - '/var/run/docker.sock:/var/run/docker.sock' + - /home/nick/configs/gitlab/runner:/etc/gitlab-runner + - /var/run/docker.sock:/var/run/docker.sock networks: routing: diff --git a/goaccess/docker-compose.yml b/goaccess/docker-compose.yml index b4a1a4d..31bf188 100644 --- a/goaccess/docker-compose.yml +++ b/goaccess/docker-compose.yml @@ -5,12 +5,12 @@ services: image: registry.karaolidis.com/nikas36/goaccess-docker restart: unless-stopped volumes: - - '/home/nick/configs/goaccess/config:/config' - - '/home/nick/configs/goaccess/GeoLite2-City.mmdb:/GeoLite2-City.mmdb' - - '/home/nick/configs/routing/nginx/log:/opt/log:ro' + - /home/nick/configs/goaccess/config:/config + - /home/nick/configs/goaccess/GeoLite2-City.mmdb:/GeoLite2-City.mmdb + - /home/nick/configs/routing/nginx/log:/opt/log:ro environment: - - 'PGID=1000' - - 'PUID=1000' + PGID: 1000 + PUID: 1000 networks: - default - routing diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml index a215cbb..e6075dc 100644 --- a/grafana/docker-compose.yml +++ b/grafana/docker-compose.yml @@ -13,7 +13,7 @@ services: - 'GF_SMTP_USER=${SMTP_USER}' - 'GF_SMTP_PASSWORD=${SMTP_PASSWORD}' - 'GF_SMTP_FROM_ADDRESS=${SMTP_FROM}' - - 'GF_RENDERING_SERVER_URL=http://grafana-image-renderer:8081/render' + - 'GF_RENDERING_SERVER_URL=http://image-renderer:8081/render' - 'GF_RENDERING_CALLBACK_URL=http://grafana:3000' - 'GF_LOG_FILTERS=rendering:debug' - 'GF_SERVER_ROOT_URL=${GF_ROOT}' @@ -27,7 +27,7 @@ services: - routing user: "1000:1000" depends_on: - - grafana_image_renderer + - image-renderer image-renderer: image: grafana/grafana-image-renderer diff --git a/littlelink/docker-compose.yml b/littlelink/docker-compose.yml index 21a9911..1a7a52c 100644 --- a/littlelink/docker-compose.yml +++ b/littlelink/docker-compose.yml @@ -5,42 +5,42 @@ services: image: timothystewart6/littlelink-server restart: unless-stopped environment: - - META_TITLE=Nick Karaolidis - - META_DESCRIPTION=Just a place where you can connect with me! - - META_AUTHOR=Nick Karaolidis - - META_INDEX_STATUS=all - - FAVICON_URL=https://cloud.karaolidis.com/s/rnkLMXDrA3Be5qY/preview - - LANG=en - - OG_TITLE=Nick Karaolidis - - OG_SITE_NAME=Nick Karaolidis - - OG_URL=https://social.karaolidis.com - - OG_IMAGE=https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview - - OG_IMAGE_WIDTH=400 - - OG_IMAGE_HEIGHT=400 - - THEME=Dark - - NAME=Nick Karaolidis - - BIO=Studying Computer Science @ The University of Manchester - - AVATAR_URL=https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview - - AVATAR_2X_URL=https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview - - AVATAR_ALT=Nick Karaolidis Profile Pic - - BUTTON_ORDER=GHOST,EMAIL,FACEBOOK,TWITTER,INSTAGRAM,TIKTOK,REDDIT,DISCORD,LINKED_IN,GITLAB,GITHUB,YOUTUBE,TWITCH,SPOTIFY,SOUND_CLOUD,STEAM - - GHOST=https://blog.karaolidis.com/ - - EMAIL=nick@karaolidis.com - - EMAIL_TEXT=E-mail - - FACEBOOK=https://www.facebook.com/karaolidis - - TWITTER=https://twitter.com/karaolidis - - INSTAGRAM=https://www.instagram.com/karaolidis - - TIKTOK=https://www.tiktok.com/@karaolidis - - REDDIT=https://www.reddit.com/user/Nikas36 - - DISCORD=https://discord.com/users/Nick%20Karaolidis#1594 - - LINKED_IN=https://www.linkedin.com/in/nikolaos-karaolidis - - GITLAB=https://git.karaolidis.com/Nikas36 - - GITHUB=https://github.com/Nikas36 - - YOUTUBE=https://www.youtube.com/c/Nikas36 - - TWITCH=https://www.twitch.tv/nickkarao - - SPOTIFY=https://open.spotify.com/user/nikas36 - - SOUND_CLOUD=https://soundcloud.com/nikas36 - - STEAM=https://steamcommunity.com/profiles/76561198118267119 + META_TITLE: Nick Karaolidis + META_DESCRIPTION: Just a place where you can connect with me! + META_AUTHOR: Nick Karaolidis + META_INDEX_STATUS: all + FAVICON_URL: https://cloud.karaolidis.com/s/rnkLMXDrA3Be5qY/preview + LANG: en + OG_TITLE: Nick Karaolidis + OG_SITE_NAME: Nick Karaolidis + OG_URL: https://social.karaolidis.com + OG_IMAGE: https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview + OG_IMAGE_WIDTH: 400 + OG_IMAGE_HEIGHT: 400 + THEME: Dark + NAME: Nick Karaolidis + BIO: Studying Computer Science @ The University of Manchester + AVATAR_URL: https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview + AVATAR_2X_URL: https://cloud.karaolidis.com/s/znZYdGwDQjMbXQg/preview + AVATAR_ALT: Nick Karaolidis Profile Pic + BUTTON_ORDER: GHOST,EMAIL,FACEBOOK,TWITTER,INSTAGRAM,TIKTOK,REDDIT,DISCORD,LINKED_IN,GITLAB,GITHUB,YOUTUBE,TWITCH,SPOTIFY,SOUND_CLOUD,STEAM + GHOST: https://blog.karaolidis.com/ + EMAIL: nick@karaolidis.com + EMAIL_TEXT: E-mail + FACEBOOK: https://www.facebook.com/karaolidis + TWITTER: https://twitter.com/karaolidis + INSTAGRAM: https://www.instagram.com/karaolidis + TIKTOK: https://www.tiktok.com/@karaolidis + REDDIT: https://www.reddit.com/user/Nikas36 + DISCORD: https://discord.com/users/Nick%20Karaolidis#1594 + LINKED_IN: https://www.linkedin.com/in/nikolaos-karaolidis + GITLAB: https://git.karaolidis.com/Nikas36 + GITHUB: https://github.com/Nikas36 + YOUTUBE: https://www.youtube.com/c/Nikas36 + TWITCH: https://www.twitch.tv/nickkarao + SPOTIFY: https://open.spotify.com/user/nikas36 + SOUND_CLOUD: https://soundcloud.com/nikas36 + STEAM: https://steamcommunity.com/profiles/76561198118267119 networks: - routing diff --git a/matterrmost/docker-compose.yml b/matterrmost/docker-compose.yml index 9aae13d..c5f0113 100644 --- a/matterrmost/docker-compose.yml +++ b/matterrmost/docker-compose.yml @@ -12,10 +12,10 @@ services: - /home/nick/configs/mattermost/client/plugins:/mattermost/client/plugins - /home/nick/configs/mattermost/bleve-indexes:/mattermost/bleve-indexes environment: - - MM_SERVICESETTINGS_SITEURL=${URL} - - MM_BLEVESETTINGS_INDEXDIR=/mattermost/bleve-indexes - - MM_SQLSETTINGS_DRIVERNAME=postgres - - MM_SQLSETTINGS_DATASOURCE=postgres://mattermost:mattermost@db:5432/mattermost?sslmode=disable + MM_SERVICESETTINGS_SITEURL: ${URL} + MM_BLEVESETTINGS_INDEXDIR: /mattermost/bleve-indexes + MM_SQLSETTINGS_DRIVERNAME: postgres + MM_SQLSETTINGS_DATASOURCE: postgres://mattermost:mattermost@db:5432/mattermost?sslmode=disable networks: - default - routing @@ -25,12 +25,12 @@ services: db: image: postgres:13 restart: unless-stopped - environment: - - POSTGRES_USER=mattermost - - POSTGRES_PASSWORD=mattermost - - POSTGRES_DB=mattermost volumes: - /home/nick/configs/mattermost/db:/var/lib/postgresql/data + environment: + POSTGRES_USER: mattermost + POSTGRES_PASSWORD: mattermost + POSTGRES_DB: mattermost user: 1000:1000 networks: diff --git a/media/docker-compose.yml b/media/docker-compose.yml index c6cc2b8..8aee8bf 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -4,44 +4,44 @@ services: plex: image: plexinc/pms-docker restart: unless-stopped - hostname: 'jupiter' - environment: - - 'PUID=1000' - - 'PGID=1000' - - 'PLEX_UID=1000' - - 'PLEX_GID=1000' - - 'PLEX_CLAIM=${PLEX_CLAIM}' - - 'ADVERTISE_IP=${ADVERTISE_IP}' - - 'ALLOWED_NETWORKS=${ALLOWED_NETWORKS}' + hostname: jupiter volumes: - /home/nick/configs/media/plex:/config - /home/nick/configs/media/plex/tmp_transcode:/transcode - /mnt/storage/public/media:/data + environment: + PUID: 1000 + PGID: 1000 + PLEX_UID: 1000 + PLEX_GID: 1000 + PLEX_CLAIM: ${PLEX_CLAIM} + ADVERTISE_IP: ${ADVERTISE_IP} + ALLOWED_NETWORKS: ${ALLOWED_NETWORKS} devices: - - '/dev/dri:/dev/dri' + - /dev/dri:/dev/dri networks: - default - routing ports: - - '32400:32400/tcp' - - '3005:3005/tcp' - - '8324:8324/tcp' - - '32469:32469/tcp' - - '1900:1900/udp' - - '32410:32410/udp' - - '32412:32412/udp' - - '32413:32413/udp' - - '32414:32414/udp' + - 32400:32400/tcp + - 3005:3005/tcp + - 8324:8324/tcp + - 32469:32469/tcp + - 1900:1900/udp + - 32410:32410/udp + - 32412:32412/udp + - 32413:32413/udp + - 32414:32414/udp ombi: image: linuxserver/ombi restart: unless-stopped - environment: - - 'PUID=1000' - - 'PGID=1000' - - 'BASE_URL=/request' volumes: - /home/nick/configs/media/ombi:/config + environment: + PUID: 1000 + PGID: 1000 + BASE_URL: /request networks: - default - routing @@ -49,11 +49,11 @@ services: tautulli: image: tautulli/tautulli restart: unless-stopped - environment: - - 'PUID=1000' - - 'PGID=1000' volumes: - /home/nick/configs/media/tautulli:/config + environment: + PUID: 1000 + PGID: 1000 networks: - default - routing @@ -61,12 +61,12 @@ services: prowlarr: image: linuxserver/prowlarr:develop restart: unless-stopped - environment: - - PUID=1000 - - PGID=1000 volumes: - - '/home/nick/configs/media/prowlarr:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/media/prowlarr:/config + - /mnt/storage/public:/data + environment: + PUID: 1000 + PGID: 1000 networks: - default - routing @@ -74,12 +74,12 @@ services: radarr: image: linuxserver/radarr restart: unless-stopped - environment: - - PGID=1000 - - PUID=1000 volumes: - - '/home/nick/configs/media/radarr:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/media/radarr:/config + - /mnt/storage/public:/data + environment: + PGID: 1000 + PUID: 1000 networks: - default - routing @@ -89,12 +89,12 @@ services: sonarr: image: linuxserver/sonarr restart: unless-stopped - environment: - - PGID=1000 - - PUID=1000 volumes: - - '/home/nick/configs/media/sonarr:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/media/sonarr:/config + - /mnt/storage/public:/data + environment: + PGID: 1000 + PUID: 1000 networks: - default - routing @@ -104,12 +104,12 @@ services: lidarr: image: linuxserver/lidarr restart: unless-stopped - environment: - - PGID=1000 - - PUID=1000 volumes: - - '/home/nick/configs/media/lidarr:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/media/lidarr:/config + - /mnt/storage/public:/data + environment: + PGID: 1000 + PUID: 1000 networks: - default - routing @@ -119,12 +119,12 @@ services: bazarr: image: linuxserver/bazarr restart: unless-stopped - environment: - - PGID=1000 - - PUID=1000 volumes: - - '/home/nick/configs/media/bazarr:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/media/bazarr:/config + - /mnt/storage/public:/data + environment: + PGID: 1000 + PUID: 1000 networks: - default - routing @@ -136,9 +136,9 @@ services: image: registry.karaolidis.com/nikas36/plex-subtitle-uploader restart: unless-stopped environment: - - "PLEX_URL=http://plex:32400" - - "SUBDOMAIN=/subs-upload" - - "PLEX_TOKEN=${PLEX_TOKEN}" + PLEX_URL: http://plex:32400 + SUBDOMAIN: /subs-upload + PLEX_TOKEN: ${PLEX_TOKEN} networks: - default - routing diff --git a/n8n/docker-compose.yml b/n8n/docker-compose.yml index c5f707a..811e2c2 100644 --- a/n8n/docker-compose.yml +++ b/n8n/docker-compose.yml @@ -4,23 +4,23 @@ services: n8n: image: n8nio/n8n restart: unless-stopped - environment: - - DB_TYPE=postgresdb - - DB_POSTGRESDB_HOST=db - - DB_POSTGRESDB_PORT=5432 - - DB_POSTGRESDB_DATABASE=n8n - - DB_POSTGRESDB_USER=n8n - - DB_POSTGRESDB_PASSWORD=n8n - - N8N_BASIC_AUTH_ACTIVE=false - - WEBHOOK_URL=${N8N_URL} - - N8N_EDITOR_BASE_URL=${N8N_URL} - - N8N_SMTP_HOST=${SMTP_HOST} - - N8N_SMTP_PORT=${SMTP_PORT} - - N8N_SMTP_USER=${SMTP_USER} - - N8N_SMTP_PASS=${SMTP_PASSWORD} - - N8N_SMTP_SENDER=${SMTP_FROM} volumes: - /home/nick/configs/n8n/config:/home/node + environment: + DB_TYPE: postgresdb + DB_POSTGRESDB_HOST: db + DB_POSTGRESDB_PORT: 5432 + DB_POSTGRESDB_DATABASE: n8n + DB_POSTGRESDB_USER: n8n + DB_POSTGRESDB_PASSWORD: n8n + N8N_BASIC_AUTH_ACTIVE: false + WEBHOOK_URL: ${N8N_URL} + N8N_EDITOR_BASE_URL: ${N8N_URL} + N8N_SMTP_HOST: ${SMTP_HOST} + N8N_SMTP_PORT: ${SMTP_PORT} + N8N_SMTP_USER: ${SMTP_USER} + N8N_SMTP_PASS: ${SMTP_PASSWORD} + N8N_SMTP_SENDER: ${SMTP_FROM} depends_on: - db networks: @@ -30,12 +30,12 @@ services: db: image: postgres:11 restart: unless-stopped - environment: - - POSTGRES_USER=n8n - - POSTGRES_PASSWORD=n8n - - POSTGRES_DB=n8n volumes: - /home/nick/configs/n8n/db:/var/lib/postgresql/data + environment: + POSTGRES_USER: n8n + POSTGRES_PASSWORD: n8n + POSTGRES_DB: n8n user: 1000:1000 networks: diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index fcec419..46b594d 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -5,13 +5,13 @@ services: image: linuxserver/nextcloud restart: unless-stopped volumes: - - '/home/nick/configs/nextcloud/nc_conf:/config' - - '/mnt/storage/configs/nextcloud/data:/data' - - '/mnt/storage/public:/public' - - '/mnt/storage/private:/private' + - /home/nick/configs/nextcloud/nc_conf:/config + - /mnt/storage/configs/nextcloud/data:/data + - /mnt/storage/public:/public + - /mnt/storage/private:/private environment: - - PUID=1000 - - PGID=1000 + PUID: 1000 + PGID: 1000 networks: - default - routing @@ -22,13 +22,13 @@ services: image: mariadb:10.5 restart: unless-stopped volumes: - - '/home/nick/configs/nextcloud/nc_db:/var/lib/mysql' + - /home/nick/configs/nextcloud/nc_db:/var/lib/mysql environment: - - MYSQL_RANDOM_ROOT_PASSWORD=yes - - MYSQL_USER=nextcloud - - MYSQL_PASSWORD=nextcloud - - MYSQL_DATABASE=nextcloud - user: '1000:1000' + MYSQL_RANDOM_ROOT_PASSWORD: yes + MYSQL_USER: nextcloud + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: nextcloud + user: 1000:1000 networks: routing: diff --git a/outline/docker-compose.yml b/outline/docker-compose.yml index d11ada8..64d8194 100644 --- a/outline/docker-compose.yml +++ b/outline/docker-compose.yml @@ -6,38 +6,38 @@ services: restart: unless-stopped command: sh -c "yarn db:migrate --env production-ssl-disabled && yarn start" environment: - - SECRET_KEY=${OUTLINE_SECRET_KEY} - - UTILS_SECRET=${OUTLINE_UTILS_SECRET} - - DATABASE_URL=postgres://outline:outline@db:5432/outline - - DATABASE_URL_TEST=postgres://outline:outline@db:5432/outline-test - - PGSSLMODE=disable - - REDIS_URL=redis://redis:6379 - - URL=${OUTLINE_URL} - - PORT=${OUTLINE_PORT} - - AWS_ACCESS_KEY_ID=${MINIO_ID} - - AWS_SECRET_ACCESS_KEY=${MINIO_SECRET} - - AWS_REGION=us-east-1 - - AWS_S3_UPLOAD_BUCKET_URL=${MINIO_URL} - - AWS_S3_UPLOAD_BUCKET_NAME=outline - - AWS_S3_UPLOAD_MAX_SIZE=26214400 - - AWS_S3_FORCE_PATH_STYLE=true - - AWS_S3_ACL=private - - OIDC_CLIENT_ID=${OIDC_ID} - - OIDC_CLIENT_SECRET=${OIDC_SECRET} - - OIDC_AUTH_URI=${OIDC_AUTH_URI} - - OIDC_TOKEN_URI=${OIDC_TOKEN_URI} - - OIDC_USERINFO_URI=${OIDC_USERINFO_URI} - - OIDC_USERNAME_CLAIM=nickname - - OIDC_DISPLAY_NAME=GitLab - - OIDC_SCOPES=openid profile email - - FORCE_HTTPS=false - - ENABLE_UPDATES=true - - SMTP_HOST=${SMTP_HOST} - - SMTP_PORT=${SMTP_PORT} - - SMTP_USERNAME=${SMTP_USERNAME} - - SMTP_PASSWORD=${SMTP_PASSWORD} - - SMTP_FROM_EMAIL=${SMTP_FROM_EMAIL} - - SMTP_SECURE=${SMTP_SECURE} + SECRET_KEY: ${OUTLINE_SECRET_KEY} + UTILS_SECRET: ${OUTLINE_UTILS_SECRET} + DATABASE_URL: postgres://outline:outline@db:5432/outline + DATABASE_URL_TEST: postgres://outline:outline@db:5432/outline-test + PGSSLMODE: disable + REDIS_URL: redis://redis:6379 + URL: ${OUTLINE_URL} + PORT: ${OUTLINE_PORT} + AWS_ACCESS_KEY_ID: ${MINIO_ID} + AWS_SECRET_ACCESS_KEY: ${MINIO_SECRET} + AWS_REGION: us-east-1 + AWS_S3_UPLOAD_BUCKET_URL: ${MINIO_URL} + AWS_S3_UPLOAD_BUCKET_NAME: outline + AWS_S3_UPLOAD_MAX_SIZE: 26214400 + AWS_S3_FORCE_PATH_STYLE: true + AWS_S3_ACL: private + OIDC_CLIENT_ID: ${OIDC_ID} + OIDC_CLIENT_SECRET: ${OIDC_SECRET} + OIDC_AUTH_URI: ${OIDC_AUTH_URI} + OIDC_TOKEN_URI: ${OIDC_TOKEN_URI} + OIDC_USERINFO_URI: ${OIDC_USERINFO_URI} + OIDC_USERNAME_CLAIM: nickname + OIDC_DISPLAY_NAME: GitLab + OIDC_SCOPES: openid profile email + FORCE_HTTPS: false + ENABLE_UPDATES: true + SMTP_HOST: ${SMTP_HOST} + SMTP_PORT: ${SMTP_PORT} + SMTP_USERNAME: ${SMTP_USERNAME} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_FROM_EMAIL: ${SMTP_FROM_EMAIL} + SMTP_SECURE: ${SMTP_SECURE} depends_on: - db - redis @@ -48,12 +48,12 @@ services: db: image: postgres:14 restart: unless-stopped - environment: - - POSTGRES_USER=outline - - POSTGRES_PASSWORD=outline - - POSTGRES_DB=outline volumes: - /home/nick/configs/outline/db:/var/lib/postgresql/data + environment: + POSTGRES_USER: outline + POSTGRES_PASSWORD: outline + POSTGRES_DB: outline user: 1000:1000 redis: @@ -64,12 +64,12 @@ services: image: minio/minio restart: unless-stopped command: "minio server /data" - environment: - - MINIO_ROOT_USER=${MINIO_ID} - - MINIO_ROOT_PASSWORD=${MINIO_SECRET} - - MINIO_BROWSER=off volumes: - /home/nick/configs/outline/s3:/data + environment: + MINIO_ROOT_USER: ${MINIO_ID} + MINIO_ROOT_PASSWORD: ${MINIO_SECRET} + MINIO_BROWSER: off networks: - default - routing diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml index 8ce02ab..3ee13dd 100644 --- a/paperless/docker-compose.yml +++ b/paperless/docker-compose.yml @@ -10,22 +10,22 @@ services: healthcheck: disable: true volumes: - - '/mnt/storage/configs/paperless/data:/usr/src/paperless/data' - - '/mnt/storage/configs/paperless/media:/usr/src/paperless/media' - - '/mnt/storage/configs/paperless/export:/usr/src/paperless/export' - - '/mnt/storage/configs/paperless/consume:/usr/src/paperless/consume' + - /mnt/storage/configs/paperless/data:/usr/src/paperless/data + - /mnt/storage/configs/paperless/media:/usr/src/paperless/media + - /mnt/storage/configs/paperless/export:/usr/src/paperless/export + - /mnt/storage/configs/paperless/consume:/usr/src/paperless/consume environment: - - PAPERLESS_URL=${PAPERLESS_URL} - - PAPERLESS_REDIS=redis://redis:6379 - - PAPERLESS_DBHOST=db - - USERMAP_UID=1000 - - USERMAP_GID=1000 - - PAPERLESS_OCR_LANGUAGES=ell - - PAPERLESS_SECRET_KEY=${PAPERLESS_SECRET_KEY} - - PAPERLESS_OCR_LANGUAGE=eng - - PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=15 - - PAPERLESS_FORCE_SCRIPT_NAME=/paperless - - PAPERLESS_ENABLE_HTTP_REMOTE_USER=true + PAPERLESS_URL: ${PAPERLESS_URL} + PAPERLESS_REDIS: redis://redis:6379 + PAPERLESS_DBHOST: db + USERMAP_UID: 1000 + USERMAP_GID: 1000 + PAPERLESS_OCR_LANGUAGES: ell + PAPERLESS_SECRET_KEY: ${PAPERLESS_SECRET_KEY} + PAPERLESS_OCR_LANGUAGE: eng + PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD: 15 + PAPERLESS_FORCE_SCRIPT_NAME: /paperless + PAPERLESS_ENABLE_HTTP_REMOTE_USER: true networks: - default - routing @@ -38,12 +38,12 @@ services: image: postgres:13 restart: unless-stopped volumes: - - '/home/nick/configs/paperless/db:/var/lib/postgresql/data' + - /home/nick/configs/paperless/db:/var/lib/postgresql/data environment: POSTGRES_DB: paperless POSTGRES_USER: paperless POSTGRES_PASSWORD: paperless - user: '1000:1000' + user: 1000:1000 networks: routing: diff --git a/peercalls/docker-compose.yml b/peercalls/docker-compose.yml index 6678013..dab45c6 100644 --- a/peercalls/docker-compose.yml +++ b/peercalls/docker-compose.yml @@ -5,7 +5,7 @@ services: image: peercalls/peercalls restart: unless-stopped environment: - - "PEERCALLS_BASE_URL=/p2p" + PEERCALLS_BASE_URL: /p2p networks: - default - routing diff --git a/routing/docker-compose.yml b/routing/docker-compose.yml index ff85646..5c94565 100644 --- a/routing/docker-compose.yml +++ b/routing/docker-compose.yml @@ -12,7 +12,7 @@ services: - 80:80 - 443:443 extra_hosts: - - "host.docker.internal:host-gateway" + - host.docker.internal:host-gateway certbot: image: certbot/dns-cloudflare @@ -25,18 +25,18 @@ services: image: cloudflare/cloudflared restart: unless-stopped volumes: - - '/home/nick/configs/routing/cloudflared:/etc/cloudflared' + - /home/nick/configs/routing/cloudflared:/etc/cloudflared command: tunnel run --url https://nginx:443 --no-tls-verify jupiter - user: '1000:1000' + user: 1000:1000 cloudflare-ddns: image: oznu/cloudflare-ddns restart: unless-stopped environment: - - API_KEY=${CF_API_KEY} - - ZONE=${DOMAIN} - - SUBDOMAIN=ddns - - PROXIED=false + API_KEY: ${CF_API_KEY} + ZONE: ${DOMAIN} + SUBDOMAIN: ddns + PROXIED: false network_mode: bridge whoami: diff --git a/samba/docker-compose.yml b/samba/docker-compose.yml index b8057d0..b60bad4 100644 --- a/samba/docker-compose.yml +++ b/samba/docker-compose.yml @@ -4,14 +4,14 @@ services: samba: image: dperson/samba restart: unless-stopped - environment: - - 'USERID=1000' - - 'GROUPID=1000' volumes: - - '/mnt/storage:/mount' + - /mnt/storage:/mount + environment: + USERID: 1000 + GROUPID: 1000 ports: - - "139:139/tcp" - - "445:445/tcp" + - 139:139/tcp + - 445:445/tcp network_mode: bridge command: ${SMB_COMMAND} stdin_open: true diff --git a/scrutiny/docker-compose.yml b/scrutiny/docker-compose.yml index 0c20207..89ace4f 100644 --- a/scrutiny/docker-compose.yml +++ b/scrutiny/docker-compose.yml @@ -5,13 +5,13 @@ services: image: ghcr.io/analogj/scrutiny:master-omnibus restart: unless-stopped volumes: - - '/home/nick/configs/scrutiny/config:/opt/scrutiny/config' - - '/home/nick/configs/scrutiny/influxdb2:/opt/scrutiny/influxdb' - - '/run/udev:/run/udev:ro' + - /home/nick/configs/scrutiny/config:/opt/scrutiny/config + - /home/nick/configs/scrutiny/influxdb2:/opt/scrutiny/influxdb + - /run/udev:/run/udev:ro environment: - - 'PUID=1000' - - 'PGID=1000' - - 'COLLECTOR_API_ENDPOINT=http://localhost:8080/storage' + PUID: 1000 + PGID: 1000 + COLLECTOR_API_ENDPOINT: http://localhost:8080/storage devices: - /dev/sda:/dev/sda - /dev/sdb:/dev/sdb diff --git a/tor/docker-compose.yml b/tor/docker-compose.yml index 01b74dd..3889f67 100644 --- a/tor/docker-compose.yml +++ b/tor/docker-compose.yml @@ -5,11 +5,11 @@ services: image: dperson/torproxy restart: unless-stopped environment: - - USERID=1000 - - GROUPID=1000 + USERID: 1000 + GROUPID: 1000 ports: - - '8118:8118' - - '9050:9050' + - 8118:8118 + - 9050:9050 networks: default: diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index d0fe3ef..8672057 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -4,16 +4,16 @@ services: transmission: image: linuxserver/transmission restart: unless-stopped - environment: - - PGID=1000 - - PUID=1000 - - TRANSMISSION_WEB_HOME=/flood-for-transmission/ volumes: - - '/home/nick/configs/transmission:/config' - - '/mnt/storage/public:/data' + - /home/nick/configs/transmission:/config + - /mnt/storage/public:/data + environment: + PGID: 1000 + PUID: 1000 + TRANSMISSION_WEB_HOME: /flood-for-transmission/ ports: - - '51413:51413' - - '51413:51413/udp' + - 51413:51413 + - 51413:51413/udp networks: - default - routing diff --git a/umami/docker-compose.yml b/umami/docker-compose.yml index a388f41..5bad0c8 100644 --- a/umami/docker-compose.yml +++ b/umami/docker-compose.yml @@ -18,14 +18,14 @@ services: db: image: postgres:13.4 restart: unless-stopped + volumes: + - /home/nick/configs/umami/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro + - /home/nick/configs/umami/data:/var/lib/postgresql/data environment: POSTGRES_DB: umami POSTGRES_USER: umami POSTGRES_PASSWORD: umami - volumes: - - '/home/nick/configs/umami/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro' - - '/home/nick/configs/umami/data:/var/lib/postgresql/data' - user: '1000:1000' + user: 1000:1000 networks: routing: diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml index 9674572..de98f8a 100644 --- a/uptime-kuma/docker-compose.yml +++ b/uptime-kuma/docker-compose.yml @@ -5,7 +5,10 @@ services: image: louislam/uptime-kuma restart: unless-stopped volumes: - - '/home/nick/configs/uptime-kuma:/app/data' + - /home/nick/configs/uptime-kuma:/app/data + environment: + PUID: 1000 + PGID: 1000 networks: - default - routing diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 564e25f..2164e05 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -5,12 +5,12 @@ services: image: vaultwarden/server restart: unless-stopped volumes: - - '/home/nick/configs/vaultwarden:/data' + - /home/nick/configs/vaultwarden:/data environment: - - 'ADMIN_TOKEN=${ADMIN_TOKEN}' + ADMIN_TOKEN: ${ADMIN_TOKEN} networks: - routing - user: "1000:1000" + user: 1000:1000 networks: routing: diff --git a/vpn/docker-compose.yml b/vpn/docker-compose.yml index 1802c5e..1c694fe 100644 --- a/vpn/docker-compose.yml +++ b/vpn/docker-compose.yml @@ -5,12 +5,12 @@ services: image: kylemanna/openvpn restart: unless-stopped volumes: - - '/home/nick/configs/vpn/openvpn:/etc/openvpn' + - /home/nick/configs/vpn/openvpn:/etc/openvpn environment: - - PUID=1000 - - PGID=1000 + PUID: 1000 + PGID: 1000 ports: - - '1194:1194/udp' + - 1194:1194/udp cap_add: - NET_ADMIN @@ -18,12 +18,12 @@ services: image: weejewel/wg-easy restart: unless-stopped volumes: - - '/home/nick/configs/vpn/wireguard:/etc/wireguard' + - /home/nick/configs/vpn/wireguard:/etc/wireguard environment: - - WG_HOST=${WG_URL} - - WG_DEFAULT_DNS=1.1.1.1, 1.0.0.1 + WG_HOST: ${WG_URL} + WG_DEFAULT_DNS: 1.1.1.1, 1.0.0.1 ports: - - '51820:51820/udp' + - 51820:51820/udp networks: - default - routing diff --git a/yourls/docker-compose.yml b/yourls/docker-compose.yml index e9ed210..81d3294 100644 --- a/yourls/docker-compose.yml +++ b/yourls/docker-compose.yml @@ -5,12 +5,12 @@ services: image: registry.karaolidis.com/nikas36/yourls-plugins restart: unless-stopped environment: - - 'YOURLS_DB_HOST=db:3306' - - 'YOURLS_DB_USER=yourls' - - 'YOURLS_DB_PASS=yourls' - - 'YOURLS_SITE=${YOURLS_URL}' - - 'YOURLS_USER=${YOURLS_USER}' - - 'YOURLS_PASS=${YOURLS_PASS}' + YOURLS_DB_HOST: db:3306 + YOURLS_DB_USER: yourls + YOURLS_DB_PASS: yourls + YOURLS_SITE: ${YOURLS_URL} + YOURLS_USER: ${YOURLS_USER} + YOURLS_PASS: ${YOURLS_PASS} networks: - default - routing @@ -21,13 +21,13 @@ services: image: mysql restart: unless-stopped volumes: - - '/home/nick/configs/yourls:/var/lib/mysql' + - /home/nick/configs/yourls:/var/lib/mysql environment: - - 'MYSQL_RANDOM_ROOT_PASSWORD=yes' - - 'MYSQL_USER=yourls' - - 'MYSQL_PASSWORD=yourls' - - 'MYSQL_DATABASE=yourls' - user: '1000:1000' + MYSQL_RANDOM_ROOT_PASSWORD: yes + MYSQL_USER: yourls + MYSQL_PASSWORD: yourls + MYSQL_DATABASE: yourls + user: 1000:1000 networks: routing: