From ae68a565efdb00b604cfd78525503feec3dfb61d Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 30 Jan 2018 15:12:01 +0100
Subject: [PATCH] Expose correct Postfix port and remove manual pages

---
 README.md          | 1 +
 postfix.sh         | 1 -
 postfix/Dockerfile | 8 +++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a72adfc..ea0ecda 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ vi 00-install.sh
 | MariaDB     |  3306 |
 | RabbitMQ    |  5672 |
 | Redis       |  6379 |
+| Postfix     |    25 |
 | Postgres    |  5432 |
 | Solr        |  8983 |
 
diff --git a/postfix.sh b/postfix.sh
index 8e37334..c800add 100755
--- a/postfix.sh
+++ b/postfix.sh
@@ -7,7 +7,6 @@ docker build -t postfix ${SOURCE_DIR}
 
 # Copy existing config files into persistent storage
 mkdir -p /srv/postfix/conf /srv/postfix/data
-chown -R 587:587 /srv/postfix/data
 docker run --rm -v /srv/postfix/conf:/mnt/conf postfix cp -rp /etc/postfix/. /mnt/conf
 
 # Configure postfix
diff --git a/postfix/Dockerfile b/postfix/Dockerfile
index 6facdaa..ba25800 100644
--- a/postfix/Dockerfile
+++ b/postfix/Dockerfile
@@ -6,11 +6,13 @@ RUN \
  addgroup -S -g 587 postfix \
  && adduser -S -u 587 -h /var/spool/postfix -s /bin/false -g postfix -G postfix postfix \
  # Install Postfix
- && apk --no-cache add ca-certificates postfix s6
+ && apk --no-cache add ca-certificates postfix s6 \
+ # Cleanup
+ && rm -r /etc/postfix/access /etc/postfix/aliases /etc/postfix/canonical /etc/postfix/dynamicmaps.cf* /etc/postfix/generic /etc/postfix/header_checks /etc/postfix/postfix-files.d /etc/postfix/relocated /etc/postfix/transport /etc/postfix/virtual
 
 COPY docker/ /
 
-VOLUME ["/var/spool/postfix"]
-EXPOSE 587
+VOLUME ["/etc/postfix", "/var/spool/postfix"]
+EXPOSE 25
 
 CMD ["s6-svscan", "/etc/services.d"]