From 84b2c3bc2647ce3c39ea18f0eafa3b31c82b9897 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 3 Apr 2025 13:16:36 -0300
Subject: [PATCH 1/2] feat: smtp port

---
 .env.sample        | 1 +
 abra.sh            | 2 +-
 compose.yml        | 1 +
 entrypoint.sh.tmpl | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index 75ba12d..4168045 100644
--- a/.env.sample
+++ b/.env.sample
@@ -14,4 +14,5 @@ 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=
diff --git a/abra.sh b/abra.sh
index db2dfdb..03a295e 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1 +1 @@
-export ENTRYPOINT_VERSION=v4
+export ENTRYPOINT_VERSION=v5
diff --git a/compose.yml b/compose.yml
index c51d285..2c9e37e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -16,6 +16,7 @@ services:
       - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
       - 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..d92e2e2 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}
 
 # https://github.com/wallabag/docker/blob/master/root/entrypoint.sh
 sh -c "/entrypoint.sh migrate"

From 290333d38b72d6551cfc730ec6d2f826a36318a0 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 23 Apr 2025 16:07:42 -0300
Subject: [PATCH 2/2] fix: backwards compatibility

---
 entrypoint.sh.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index d92e2e2..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}:${SYMFONY__ENV__MAILER_PORT}
+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"