diff --git a/simplelogin/docker-compose.yml b/simplelogin/docker-compose.yml index 51e7380..a38ce38 100644 --- a/simplelogin/docker-compose.yml +++ b/simplelogin/docker-compose.yml @@ -39,20 +39,15 @@ services: DB_USER: postgres DB_PASSWORD_FILE: /run/secrets/POSTGRES_PASSWORD DB_NAME: simplelogin - ALIASES_DEFAULT_DOMAIN: mydomain.xyz - POSTFIX_FQDN: alias.mydomain.xyz + ALIASES_DEFAULT_DOMAIN: 64815139.xyz + POSTFIX_FQDN: alias.64815139.xyz EMAIL_HANDLER_HOST: simplelogin-handler RELAY_HOST: in-v3.mailjet.com RELAY_PORT: 587 RELAY_HOST_PASSWORD_FILE: /run/secrets/RELAY_PASSWORD SIMPLELOGIN_COMPATIBILITY_MODE: v4 ENABLE_PROXY_PROTOCOL: "false" - entrypoint: | - /bin/sh -c ' - MYNETWORKS=$(ip -o -f inet addr show eth0 | awk "/scope global/ {print \$4}") && - export MYNETWORKS && - exec /docker-entrypoint.sh - ' + entrypoint: /bin/sh -c 'MYNETWORKS=$(ip -o -f inet addr show eth0 | awk "/scope global/ {print \$4}"); export MYNETWORKS; exec /docker-entrypoint.sh' networks: - default depends_on: @@ -67,6 +62,8 @@ services: - ./data/dkim/dkim.key:/dkim.key - ./data/dkim/dkim.pub.key:/dkim.pub.key - ./data/env/simplelogin.env:/code/.env + env_file: + - ./secrets/app/.env networks: - default restart: always @@ -81,6 +78,8 @@ services: image: simplelogin/app:latest container_name: simplelogin_email command: python email_handler.py + env_file: + - ./secrets/app/.env volumes: - ./data/sl:/sl - ./data/sl/upload:/code/static/upload @@ -97,6 +96,8 @@ services: image: simplelogin/app:latest container_name: simplelogin_job-runner command: python job_runner.py + env_file: + - ./secrets/app/.env volumes: - ./data/sl:/sl - ./data/sl/upload:/code/static/upload