From aaf706bf77d7734baa1d179888a207b1b5a72ff4 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Wed, 8 Nov 2023 14:27:42 -0500
Subject: [PATCH] escape env vars in container

---
 services/auth.yaml   | 16 ++++++++--------
 services/backup.yaml |  2 +-
 services/mail.yaml   |  8 ++++----
 services/proxy.yaml  |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/services/auth.yaml b/services/auth.yaml
index e650254..b67517b 100644
--- a/services/auth.yaml
+++ b/services/auth.yaml
@@ -20,17 +20,17 @@ services:
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true
-      ZITADEL_EXTERNALDOMAIN: auth.${DOMAIN}
+      ZITADEL_EXTERNALDOMAIN: auth.$${DOMAIN}
       ZITADEL_EXTERNALPORT: 443
-      ZITADEL_WEBAUTHN_NAME: ${DOMAIN}
+      ZITADEL_WEBAUTHN_NAME: $${DOMAIN}
       ZITADEL_FIRSTINSTANCE_ORG_NAME: basement
-      ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
-      ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
+      ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: $${ADMIN_USER}
+      ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: $${ADMIN_PASS}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: ${DOMAIN}
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_HOST}:${SMTP_PORT}"
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: ${SMTP_USER}
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: ${SMTP_PASS}
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: $${DOMAIN}
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "$${SMTP_HOST}:$${SMTP_PORT}"
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: $${SMTP_USER}
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: $${SMTP_PASS}
     secrets:
       - MASTER_KEY
     command: "start-from-init --masterkeyFile /run/secrets/MASTER_KEY --tlsMode external"
diff --git a/services/backup.yaml b/services/backup.yaml
index b3c6d18..d62f4b0 100644
--- a/services/backup.yaml
+++ b/services/backup.yaml
@@ -20,7 +20,7 @@ services:
     secrets: [B2_APPLICATION_KEY, B2_APPLICATION_KEY_ID, BUCKET_NAME, PASSPHRASE]
     env_file: ../env
     environment:
-      HOSTNAME: ${DOMAIN}
+      HOSTNAME: $${DOMAIN}
       TZ: America/New_York
     volumes:
       - ./backup/backup-files:/backup-files:ro
diff --git a/services/mail.yaml b/services/mail.yaml
index 95c1211..8e2050e 100644
--- a/services/mail.yaml
+++ b/services/mail.yaml
@@ -26,8 +26,8 @@ services:
         condition: 'service_completed_successfully'
     env_file: ../env
     environment:
-      - MADDY_HOSTNAME=mx.mail.${DOMAIN}
-      - MADDY_DOMAIN=mail.${DOMAIN}
+      - MADDY_HOSTNAME=mx.mail.$${DOMAIN}
+      - MADDY_DOMAIN=mail.$${DOMAIN}
     volumes:
       - ../data/mail/maddy:/data
       # TODO: get from caddy?
@@ -43,9 +43,9 @@ services:
     image: roundcube/roundcubemail:1.6.x-apache
     env_file: ../env
     environment:
-      ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.${DOMAIN}
+      ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.$${DOMAIN}
       ROUNDCUBEMAIL_DEFAULT_PORT: 993
-      ROUNDCUBEMAIL_SMTP_SERVER: tls://mx.mail.${DOMAIN}
+      ROUNDCUBEMAIL_SMTP_SERVER: tls://mx.mail.$${DOMAIN}
       ROUNDCUBEMAIL_SMTP_PORT: 587
       ROUNDCUBEMAIL_DB_TYPE: sqlite
     volumes:
diff --git a/services/proxy.yaml b/services/proxy.yaml
index 62ae6e5..6e6dfbc 100644
--- a/services/proxy.yaml
+++ b/services/proxy.yaml
@@ -13,8 +13,9 @@ services:
       - ../data/proxy/caddy/site:/site
       - ../data/proxy/caddy/data:/data
       - ../data/proxy/caddy/config:/config
+    env_file: ../env
     environment:
-      - DOMAIN
+      - DOMAIN=$${DOMAIN}
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost"]
       interval: '10s'