From 52f96d4cffe3b7904002b2d03673f900d15c27c1 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sun, 15 Jul 2018 10:12:47 +0100 Subject: [PATCH] Improve comments --- stretch/Dockerfile | 4 ---- stretch/docker-entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/stretch/Dockerfile b/stretch/Dockerfile index 340ba23..f2481c6 100644 --- a/stretch/Dockerfile +++ b/stretch/Dockerfile @@ -8,11 +8,7 @@ RUN set -ex; \ apt-get install -y exim4-daemon-light; \ apt-get clean -# Copy the main script. COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -# We expose exim on port 25. EXPOSE 25/tcp - ENTRYPOINT [ "docker-entrypoint.sh" ] CMD [ "exim", "-bdf", "-v", "-q30m" ] diff --git a/stretch/docker-entrypoint.sh b/stretch/docker-entrypoint.sh index c68c550..feebf54 100755 --- a/stretch/docker-entrypoint.sh +++ b/stretch/docker-entrypoint.sh @@ -10,7 +10,7 @@ DC_EXIMCONFIG_CONFIGTYPE="internet" # in case port 25 is accidentally exposed to the public internet. DC_RELAY_NETS="10.0.0.0/8;172.16.0.0/12;192.168.0.0/16" -# Set smarthost. +# If RELAY_HOST has been set then switch to smart host configuration. if [ "x$RELAY_HOST" != "x" ]; then DC_EXIMCONFIG_CONFIGTYPE="satellite" DC_SMARTHOST="$RELAY_HOST::${RELAY_PORT:-25}"