Revert "escape env vars in container"

This reverts commit aaf706bf77.
main
Jonathan Dahan 2 years ago
parent aaf706bf77
commit ac50279901

@ -20,17 +20,17 @@ services:
environment: environment:
ZITADEL_DATABASE_COCKROACH_HOST: crdb ZITADEL_DATABASE_COCKROACH_HOST: crdb
ZITADEL_EXTERNALSECURE: true ZITADEL_EXTERNALSECURE: true
ZITADEL_EXTERNALDOMAIN: auth.$${DOMAIN} ZITADEL_EXTERNALDOMAIN: auth.${DOMAIN}
ZITADEL_EXTERNALPORT: 443 ZITADEL_EXTERNALPORT: 443
ZITADEL_WEBAUTHN_NAME: $${DOMAIN} ZITADEL_WEBAUTHN_NAME: ${DOMAIN}
ZITADEL_FIRSTINSTANCE_ORG_NAME: basement ZITADEL_FIRSTINSTANCE_ORG_NAME: basement
ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: $${ADMIN_USER} ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: $${ADMIN_PASS} ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement
ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: $${DOMAIN} ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: ${DOMAIN}
ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "$${SMTP_HOST}:$${SMTP_PORT}" ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_HOST}:${SMTP_PORT}"
ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: $${SMTP_USER} ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: ${SMTP_USER}
ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: $${SMTP_PASS} ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: ${SMTP_PASS}
secrets: secrets:
- MASTER_KEY - MASTER_KEY
command: "start-from-init --masterkeyFile /run/secrets/MASTER_KEY --tlsMode external" command: "start-from-init --masterkeyFile /run/secrets/MASTER_KEY --tlsMode external"

@ -20,7 +20,7 @@ services:
secrets: [B2_APPLICATION_KEY, B2_APPLICATION_KEY_ID, BUCKET_NAME, PASSPHRASE] secrets: [B2_APPLICATION_KEY, B2_APPLICATION_KEY_ID, BUCKET_NAME, PASSPHRASE]
env_file: ../env env_file: ../env
environment: environment:
HOSTNAME: $${DOMAIN} HOSTNAME: ${DOMAIN}
TZ: America/New_York TZ: America/New_York
volumes: volumes:
- ./backup/backup-files:/backup-files:ro - ./backup/backup-files:/backup-files:ro

@ -26,8 +26,8 @@ services:
condition: 'service_completed_successfully' condition: 'service_completed_successfully'
env_file: ../env env_file: ../env
environment: environment:
- MADDY_HOSTNAME=mx.mail.$${DOMAIN} - MADDY_HOSTNAME=mx.mail.${DOMAIN}
- MADDY_DOMAIN=mail.$${DOMAIN} - MADDY_DOMAIN=mail.${DOMAIN}
volumes: volumes:
- ../data/mail/maddy:/data - ../data/mail/maddy:/data
# TODO: get from caddy? # TODO: get from caddy?
@ -43,9 +43,9 @@ services:
image: roundcube/roundcubemail:1.6.x-apache image: roundcube/roundcubemail:1.6.x-apache
env_file: ../env env_file: ../env
environment: environment:
ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.$${DOMAIN} ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.${DOMAIN}
ROUNDCUBEMAIL_DEFAULT_PORT: 993 ROUNDCUBEMAIL_DEFAULT_PORT: 993
ROUNDCUBEMAIL_SMTP_SERVER: tls://mx.mail.$${DOMAIN} ROUNDCUBEMAIL_SMTP_SERVER: tls://mx.mail.${DOMAIN}
ROUNDCUBEMAIL_SMTP_PORT: 587 ROUNDCUBEMAIL_SMTP_PORT: 587
ROUNDCUBEMAIL_DB_TYPE: sqlite ROUNDCUBEMAIL_DB_TYPE: sqlite
volumes: volumes:

@ -13,9 +13,8 @@ services:
- ../data/proxy/caddy/site:/site - ../data/proxy/caddy/site:/site
- ../data/proxy/caddy/data:/data - ../data/proxy/caddy/data:/data
- ../data/proxy/caddy/config:/config - ../data/proxy/caddy/config:/config
env_file: ../env
environment: environment:
- DOMAIN=$${DOMAIN} - DOMAIN
healthcheck: healthcheck:
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost"] test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost"]
interval: '10s' interval: '10s'

Loading…
Cancel
Save