From 9fd2173200a1be55d9903e107ae300759777e11a Mon Sep 17 00:00:00 2001
From: Juan Luis Baptiste <juan.baptiste@gmail.com>
Date: Sun, 22 Mar 2020 23:17:24 -0500
Subject: [PATCH] Change base image from CentOS 7 to alpine linux

---
 Dockerfile             | 13 ++++++-------
 docker-compose.dev.yml |  1 +
 etc/supervisord.conf   |  2 +-
 run.sh                 |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index db5c34f..ba14ea2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,13 @@
 #Dockerfile for a Postfix email relay service
-FROM centos:7
+FROM alpine
 MAINTAINER Juan Luis Baptiste juan.baptiste@gmail.com
 
-RUN yum install -y epel-release && yum update -y && \
-    yum install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 mailx \
+RUN apk update && \
+    apk add bash gawk cyrus-sasl cyrus-sasl-plain cyrus-sasl-crammd5 mailx \
     perl supervisor postfix rsyslog \
-    && rm -rf /var/cache/yum/* \
-    && yum clean all
-RUN sed -i -e "s/^nodaemon=false/nodaemon=true/" /etc/supervisord.conf
-RUN sed -i -e 's/inet_interfaces = localhost/inet_interfaces = all/g' /etc/postfix/main.cf
+    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 /
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 0d35098..ea1e56f 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,6 +1,7 @@
 version: '2'
 services:
   postfix:
+    image: juanluisbaptiste/postfix:dev
     build:
       context: .
       dockerfile: Dockerfile
diff --git a/etc/supervisord.conf b/etc/supervisord.conf
index 78f4ac6..c7c96c7 100644
--- a/etc/supervisord.conf
+++ b/etc/supervisord.conf
@@ -22,7 +22,7 @@ nodaemon=true              ; (start in foreground if true;default false)
 minfds=1024                 ; (min. avail startup file descriptors;default 1024)
 minprocs=200                ; (min. avail process descriptors;default 200)
 ;umask=022                  ; (process file creation umask;default 022)
-;user=chrism                 ; (default is current user, required if root)
+user=root                 ; (default is current user, required if root)
 ;identifier=supervisor       ; (supervisord identifier, default is 'supervisor')
 ;directory=/tmp              ; (default is not to cd during start)
 ;nocleanup=true              ; (don't clean up tempfiles at start;default false)
diff --git a/run.sh b/run.sh
index 0701688..7473646 100644
--- a/run.sh
+++ b/run.sh
@@ -44,7 +44,7 @@ if [ ! -f /etc/postfix/sasl_passwd ]; then
   fi
 fi
 
-#Set header tag  
+#Set header tag
 if [ ! -z "${SMTP_HEADER_TAG}" ]; then
   postconf -e "header_checks = regexp:/etc/postfix/header_tag"
   echo -e "/^MIME-Version:/i PREPEND RelayTag: $SMTP_HEADER_TAG\n/^Content-Transfer-Encoding:/i PREPEND RelayTag: $SMTP_HEADER_TAG" > /etc/postfix/header_tag
@@ -70,4 +70,4 @@ add_config_value "mynetworks" "${nets}"
 # starting services
 rm -f /var/spool/postfix/pid/master.pid
 
-exec supervisord
+exec supervisord -c /etc/supervisord.conf