Merge pull request #5 from solution-libre/4-replace-namshismtp-image-…

…by-ixdotaismtp Replace namshi/smtp image by ixdotai/smtp #4
solution-libre · Mar 31, 2022 · 0708703 · 0708703
2 parents a9fe6b8 + 09a671f
commit 0708703
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 83 deletions.
diff --git a/docker-compose-barcus.override.yml b/docker-compose-barcus.override.yml
@@ -89,14 +89,12 @@ services:
         ipv4_address: "${NETWORK_PREFIX}.7"
 
   smtpd:
+    image: ixdotai/smtp
     restart: unless-stopped
-    command: ["exim", "-bd", "-q15m", "-v"]
-    entrypoint: /usr/local/bin/docker-entrypoint.sh
     hostname: "smtpd.${HOSTNAME}"
     volumes:
       - ../docker-volumes/smtpd/_docker_additional_macros:/etc/exim4/_docker_additional_macros
       - ../docker-volumes/smtpd/exim4.conf.template:/etc/exim4/exim4.conf.template
-      - ../docker-volumes/smtpd/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
     secrets:
       - smtpd-user
       - smtpd-password

diff --git a/docker-volumes/smtpd/_docker_additional_macros b/docker-volumes/smtpd/_docker_additional_macros
@@ -1,4 +1,3 @@
 MAIN_TLS_ENABLE = 1
-REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS = *
 TLS_ON_CONNECT_PORTS = 465
 REQUIRE_PROTOCOL = smtps
diff --git a/docker-volumes/smtpd/docker-entrypoint.sh b/docker-volumes/smtpd/docker-entrypoint.sh