diff --git a/.env.sample b/.env.sample index b8f04a6..04af779 100644 --- a/.env.sample +++ b/.env.sample @@ -12,6 +12,7 @@ SECRET_SMTP_PASSWORD_VERSION=v1 SYMFONY__ENV__FOSUSER_REGISTRATION=true SYMFONY__ENV__MAILER_HOST=127.0.0.1 SYMFONY__ENV__MAILER_USER=~ +SYMFONY__ENV__MAILER_PORT=465 SYMFONY__ENV__FROM_EMAIL= COMPOSE_FILE="compose.yml" diff --git a/abra.sh b/abra.sh index db2dfdb..7de1c9e 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export ENTRYPOINT_VERSION=v4 +export ENTRYPOINT_VERSION=v6 diff --git a/compose.yml b/compose.yml index 9735796..7ff4940 100644 --- a/compose.yml +++ b/compose.yml @@ -7,6 +7,7 @@ services: - POPULATE_DATABASE="false" - SYMFONY__ENV__MAILER_HOST - SYMFONY__ENV__MAILER_USER + - SYMFONY__ENV__MAILER_PORT - SYMFONY__ENV__MAILER_PASSWORD_FILE=/run/secrets/smtp_password - SYMFONY__ENV__FROM_EMAIL - SYMFONY__ENV__DOMAIN_NAME=https://${DOMAIN} diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 094b321..42a96e9 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -3,7 +3,7 @@ export SYMFONY__ENV__DATABASE_PASSWORD=$(cat $SYMFONY__ENV__DATABASE_PASSWORD_FILE) export SYMFONY__ENV__SECRET=$(cat $SYMFONY__ENV__SECRET_FILE) -export SYMFONY__ENV__MAILER_DSN=smtp://${SYMFONY__ENV__MAILER_USER}:$(cat ${SYMFONY__ENV__MAILER_PASSWORD_FILE})@${SYMFONY__ENV__MAILER_HOST}:465 +export SYMFONY__ENV__MAILER_DSN=smtp://${SYMFONY__ENV__MAILER_USER}:$(cat ${SYMFONY__ENV__MAILER_PASSWORD_FILE})@${SYMFONY__ENV__MAILER_HOST}:${SYMFONY__ENV__MAILER_PORT:-465} # https://github.com/wallabag/docker/blob/master/root/entrypoint.sh sh -c "/entrypoint.sh migrate"