From d64898107d6a1b9e161cd96404cbd7696ed14576 Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Sat, 21 Jun 2025 16:47:01 -0500
Subject: [PATCH] standardize env vars

---
 .pre-commit-config.yaml                       |  2 +-
 admin-docker/komodo/compose.yaml              | 10 +++----
 auth-docker/authentik/compose.yaml            | 26 +++++++++----------
 komodo-periphery/compose.yaml                 | 12 ++++-----
 main-docker/huntarr/compose.yaml              |  2 +-
 .../jellyfin-auto-collections/compose.yaml    | 10 +++----
 main-docker/jellyseerr/compose.yaml           |  6 ++---
 main-docker/jellystat/compose.yaml            | 16 ++++++------
 main-docker/koblas/compose.yaml               |  8 +++---
 main-docker/speedrr/compose.yaml              |  2 +-
 main-docker/wakapi/compose.yaml               | 11 +++++++-
 11 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8ca0240..51a9281 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
       - id: check-port-conflicts
         name: Check for port conflicts within docker groups
         entry: scripts/check-port-conflicts.py
-        language: python3
+        language: python
         files: '.*compose\.yaml$'
         pass_filenames: false
         always_run: true
\ No newline at end of file
diff --git a/admin-docker/komodo/compose.yaml b/admin-docker/komodo/compose.yaml
index eb09297..32423b4 100644
--- a/admin-docker/komodo/compose.yaml
+++ b/admin-docker/komodo/compose.yaml
@@ -23,8 +23,8 @@ services:
       - mongo-data:/data/db
       - mongo-config:/data/configdb
     environment:
-      MONGO_INITDB_ROOT_USERNAME: ${KOMODO_DB_USERNAME}
-      MONGO_INITDB_ROOT_PASSWORD: ${KOMODO_DB_PASSWORD}
+      - MONGO_INITDB_ROOT_USERNAME=${KOMODO_DB_USERNAME}
+      - MONGO_INITDB_ROOT_PASSWORD=${KOMODO_DB_PASSWORD}
 
   core:
     container_name: komodo-core
@@ -40,9 +40,9 @@ services:
       - 9120:9120
     env_file: .env
     environment:
-      KOMODO_DATABASE_ADDRESS: mongo:27017
-      KOMODO_DATABASE_USERNAME: ${KOMODO_DB_USERNAME}
-      KOMODO_DATABASE_PASSWORD: ${KOMODO_DB_PASSWORD}
+      - KOMODO_DATABASE_ADDRESS=mongo:27017
+      - KOMODO_DATABASE_USERNAME=${KOMODO_DB_USERNAME}
+      - KOMODO_DATABASE_PASSWORD=${KOMODO_DB_PASSWORD}
     volumes:
       ## Core cache for repos for latest commit hash / contents
       - repo-cache:/repo-cache
diff --git a/auth-docker/authentik/compose.yaml b/auth-docker/authentik/compose.yaml
index 3d4a5f0..7e580bb 100644
--- a/auth-docker/authentik/compose.yaml
+++ b/auth-docker/authentik/compose.yaml
@@ -13,9 +13,9 @@ services:
     volumes:
       - database:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ${PG_PASS:?database password required}
-      POSTGRES_USER: ${PG_USER:-authentik}
-      POSTGRES_DB: ${PG_DB:-authentik}
+      - POSTGRES_PASSWORD=${PG_PASS:?database password required}
+      - POSTGRES_USER=${PG_USER:-authentik}
+      - POSTGRES_DB=${PG_DB:-authentik}
     env_file:
       - .env
     labels:
@@ -39,11 +39,11 @@ services:
     restart: unless-stopped
     command: server
     environment:
-      AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
-      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
-      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
-      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+      - AUTHENTIK_REDIS__HOST=redis
+      - AUTHENTIK_POSTGRESQL__HOST=postgresql
+      - AUTHENTIK_POSTGRESQL__USER=${PG_USER:-authentik}
+      - AUTHENTIK_POSTGRESQL__NAME=${PG_DB:-authentik}
+      - AUTHENTIK_POSTGRESQL__PASSWORD=${PG_PASS}
     volumes:
       - /root/authentik/media:/media
       - /root/authentik/custom-templates:/templates
@@ -61,11 +61,11 @@ services:
     restart: unless-stopped
     command: worker
     environment:
-      AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
-      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
-      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
-      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+      - AUTHENTIK_REDIS__HOST=redis
+      - AUTHENTIK_POSTGRESQL__HOST=postgresql
+      - AUTHENTIK_POSTGRESQL__USER=${PG_USER:-authentik}
+      - AUTHENTIK_POSTGRESQL__NAME=${PG_DB:-authentik}
+      - AUTHENTIK_POSTGRESQL__PASSWORD=${PG_PASS}
     # `user: root` and the docker socket volume are optional.
     # See more for the docker socket integration here:
     # https://goauthentik.io/docs/outposts/integrations/docker
diff --git a/komodo-periphery/compose.yaml b/komodo-periphery/compose.yaml
index 69ea651..7984f5d 100644
--- a/komodo-periphery/compose.yaml
+++ b/komodo-periphery/compose.yaml
@@ -7,20 +7,20 @@ services:
     restart: unless-stopped
     ## https://komo.do/docs/connect-servers#configuration
     environment:
-      PERIPHERY_ROOT_DIRECTORY: ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}
+      - PERIPHERY_ROOT_DIRECTORY=${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}
       ## Pass the same passkey as used by the Komodo Core connecting to this Periphery agent.
-      PERIPHERY_PASSKEYS: ${PERIPHERY_PASSKEYS}
-      PERIPHERY_ALLOWED_IPS: ${PERIPHERY_ALLOWED_IPS:-127.0.0.1}
+      - PERIPHERY_PASSKEYS=${PERIPHERY_PASSKEYS}
+      - PERIPHERY_ALLOWED_IPS=${PERIPHERY_ALLOWED_IPS:-127.0.0.1}
       ## Make server run over https
-      PERIPHERY_SSL_ENABLED: true
+      - PERIPHERY_SSL_ENABLED=true
       ## Specify whether to disable the terminals feature
       ## and disallow remote shell access (inside the Periphery container).
-      PERIPHERY_DISABLE_TERMINALS: false
+      - PERIPHERY_DISABLE_TERMINALS=false
       ## If the disk size is overreporting, can use one of these to 
       ## whitelist / blacklist the disks to filter them, whichever is easier.
       ## Accepts comma separated list of paths.
       ## Usually whitelisting just /etc/hostname gives correct size for single root disk.
-      PERIPHERY_INCLUDE_DISK_MOUNTS: /etc/hostname
+      - PERIPHERY_INCLUDE_DISK_MOUNTS=/etc/hostname
       # PERIPHERY_EXCLUDE_DISK_MOUNTS: /snap,/etc/repos
     volumes:
       ## Mount external docker socket
diff --git a/main-docker/huntarr/compose.yaml b/main-docker/huntarr/compose.yaml
index 19fab75..2359795 100644
--- a/main-docker/huntarr/compose.yaml
+++ b/main-docker/huntarr/compose.yaml
@@ -8,4 +8,4 @@ services:
     volumes:
       - /home/docker/huntarr:/config
     environment:
-      TZ: America/Chicago
\ No newline at end of file
+      - TZ=America/Chicago
\ No newline at end of file
diff --git a/main-docker/jellyfin-auto-collections/compose.yaml b/main-docker/jellyfin-auto-collections/compose.yaml
index 9ac254f..d6f591f 100644
--- a/main-docker/jellyfin-auto-collections/compose.yaml
+++ b/main-docker/jellyfin-auto-collections/compose.yaml
@@ -4,10 +4,10 @@ services:
     container_name: jellyfin-auto-collections
     restart: unless-stopped
     environment:
-      CRONTAB: ${CRONTAB:-0 0 * * *}
-      TZ: America/Chicago
-      JELLYFIN_SERVER_URL: ${JELLYFIN_SERVER_URL}
-      JELLYFIN_API_KEY: ${JELLYFIN_API_KEY}
-      JELLYFIN_USER_ID: ${JELLYFIN_USER_ID}
+      - CRONTAB=${CRONTAB:-0 0 * * *}
+      - TZ=America/Chicago
+      - JELLYFIN_SERVER_URL=${JELLYFIN_SERVER_URL}
+      - JELLYFIN_API_KEY=${JELLYFIN_API_KEY}
+      - JELLYFIN_USER_ID=${JELLYFIN_USER_ID}
     volumes:
       - /home/docker/jellyfin-auto-collections:/app/config
\ No newline at end of file
diff --git a/main-docker/jellyseerr/compose.yaml b/main-docker/jellyseerr/compose.yaml
index 1b6d1f7..424ccbd 100644
--- a/main-docker/jellyseerr/compose.yaml
+++ b/main-docker/jellyseerr/compose.yaml
@@ -4,9 +4,9 @@ services:
     container_name: jellyseerr
     restart: unless-stopped
     environment:
-      LOG_LEVEL: info
-      TZ: America/Chicago
-      PORT: 5055
+      - LOG_LEVEL=info
+      - TZ=America/Chicago
+      - PORT=5055
     ports:
       - "5055:5055"
     volumes:
diff --git a/main-docker/jellystat/compose.yaml b/main-docker/jellystat/compose.yaml
index e70d3e1..ac44d7a 100644
--- a/main-docker/jellystat/compose.yaml
+++ b/main-docker/jellystat/compose.yaml
@@ -4,8 +4,8 @@ services:
     container_name: jellystat-db
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
       - /home/docker/jellystat/postgres:/var/lib/postgresql/data
 
@@ -14,12 +14,12 @@ services:
     container_name: jellystat
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_IP: jellystat-db
-      POSTGRES_PORT: 5432
-      JWT_SECRET: ${JWT_SECRET}
-      TZ: America/Chicago
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_IP=jellystat-db
+      - POSTGRES_PORT=5432
+      - JWT_SECRET=${JWT_SECRET}
+      - TZ=America/Chicago
     volumes:
       - /home/docker/jellystat/backup:/app/backend/backup-data
     ports:
diff --git a/main-docker/koblas/compose.yaml b/main-docker/koblas/compose.yaml
index 78a90dc..fdff9ff 100644
--- a/main-docker/koblas/compose.yaml
+++ b/main-docker/koblas/compose.yaml
@@ -6,9 +6,9 @@ services:
     ports:
       - 1080:1080
     environment:
-      RUST_LOG: debug
-      KOBLAS_LIMIT: 5
-      KOBLAS_NO_AUTHENTICATION: false
-      KOBLAS_ANONYMIZATION: true
+      - RUST_LOG=debug
+      - KOBLAS_LIMIT=5
+      - KOBLAS_NO_AUTHENTICATION=false
+      - KOBLAS_ANONYMIZATION=true
     volumes:
       - /root/koblas/config.toml:/etc/koblas/config.toml
diff --git a/main-docker/speedrr/compose.yaml b/main-docker/speedrr/compose.yaml
index 0de6c3d..864bb31 100644
--- a/main-docker/speedrr/compose.yaml
+++ b/main-docker/speedrr/compose.yaml
@@ -5,6 +5,6 @@ services:
     restart: unless-stopped
     network_mode: host
     environment:
-      SPEEDRR_CONFIG: /data/config.yaml
+      - SPEEDRR_CONFIG=/data/config.yaml
     volumes:
       - /home/docker/speedrr:/data
\ No newline at end of file
diff --git a/main-docker/wakapi/compose.yaml b/main-docker/wakapi/compose.yaml
index 14e7ff8..3131138 100644
--- a/main-docker/wakapi/compose.yaml
+++ b/main-docker/wakapi/compose.yaml
@@ -7,6 +7,15 @@ services:
     ports:
       - "3004:3000"
     environment:
-      WAKAPI_PASSWORD_SALT: ${WAKAPI_PASSWORD_SALT}
+      - WAKAPI_PASSWORD_SALT=${WAKAPI_PASSWORD_SALT}
+      - WAKAPI_ALLOW_SIGNUP=false
+      - WAKAPI_MAIL_ENABLED=true
+      - WAKAPI_MAIL_SENDER=${WAKAPI_MAIL_SENDER}
+      - WAKAPI_MAIL_PROVIDER=smtp
+      - WAKAPI_MAIL_SMTP_HOST=${WAKAPI_MAIL_SMTP_HOST}
+      - WAKAPI_MAIL_SMTP_PORT=${WAKAPI_MAIL_SMTP_PORT}
+      - WAKAPI_MAIL_SMTP_USER=${WAKAPI_MAIL_SMTP_USER}
+      - WAKAPI_MAIL_SMTP_PASS=${WAKAPI_MAIL_SMTP_PASS}
+      - WAKAPI_PUBLIC_URL=${WAKAPI_PUBLIC_URL}
     volumes:
       - /home/docker/wakapi:/data
\ No newline at end of file