feat: Removed supervisor and rsyslog

As mentioned in discussion #54, since version 3.3.0, postfix can run in foreground mode, and since 3.4.0 it can log directly to stdout.
juanluisbaptiste · May 22, 2021 · 1cfdcb5 · 1cfdcb5
1 parent 546e849
commit 1cfdcb5
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 237 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,12 +4,11 @@ MAINTAINER Juan Luis Baptiste juan.baptiste@gmail.com
 
 RUN apk update && \
     apk add bash gawk cyrus-sasl cyrus-sasl-login cyrus-sasl-crammd5 mailx \
-    perl supervisor postfix rsyslog && \
+    postfix && \
     rm -rf /var/cache/apk/* && \
     mkdir -p /var/log/supervisor/ /var/run/supervisor/ && \
     sed -i -e 's/inet_interfaces = localhost/inet_interfaces = all/g' /etc/postfix/main.cf
 
-COPY etc/ /etc/
 COPY run.sh /
 RUN chmod +x /run.sh
 RUN newaliases

diff --git a/README.md b/README.md
@@ -13,9 +13,6 @@ This image is available for the following architectures:
 * armv7
 * arm64
 
-It also includes rsyslog to enable logging to stdout.
-
-
 _If you want to follow the development of this project check out [my blog](https://www.juanbaptiste.tech/category/postfx)._
 
 ### Available image tags

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
diff --git a/etc/rsyslog.d/listen.conf b/etc/rsyslog.d/listen.conf
diff --git a/etc/supervisord.conf b/etc/supervisord.conf
diff --git a/etc/supervisord.d/postfix.ini b/etc/supervisord.d/postfix.ini
diff --git a/etc/supervisord.d/readlog.ini b/etc/supervisord.d/readlog.ini
diff --git a/etc/supervisord.d/rsyslog.ini b/etc/supervisord.d/rsyslog.ini
diff --git a/run.sh b/run.sh
@@ -26,6 +26,7 @@ SMTP_PORT="${SMTP_PORT:-587}"
 DOMAIN=`echo ${SERVER_HOSTNAME} | awk 'BEGIN{FS=OFS="."}{print $(NF-1),$NF}'`
 
 # Set needed config options
+add_config_value "maillog_file" "/dev/stdout"
 add_config_value "myhostname" ${SERVER_HOSTNAME}
 add_config_value "mydomain" ${DOMAIN}
 add_config_value "mydestination" 'localhost'
@@ -90,4 +91,4 @@ fi
 # starting services
 rm -f /var/spool/postfix/pid/master.pid
 
-exec supervisord -c /etc/supervisord.conf
+exec /usr/sbin/postfix -c /etc/postfix start-fg