From abe918f817eb56291929438fdf82f68dc176a3eb Mon Sep 17 00:00:00 2001 From: christophefromparis Date: Thu, 7 Feb 2019 09:15:13 +0100 Subject: [PATCH] Remove unused Postfix --- Dockerfile-alpine | 2 +- Dockerfile-centos | 3 +-- README.md | 2 -- run.sh | 7 ------- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Dockerfile-alpine b/Dockerfile-alpine index e1d032b..fa61928 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -3,7 +3,7 @@ LABEL org.label-schema.name="simplicite" \ org.label-schema.vendor="Simplicite Software" \ org.label-schema.url="https://www.simplicite.io" \ org.label-schema.description="Simplicite server (alpine)" -RUN apk update && apk upgrade && apk add --update bash git curl ca-certificates mysql-client postgresql-client apache-ant postfix && rm -rf /var/cache/apk/* +RUN apk update && apk upgrade && apk add --update bash git curl ca-certificates mysql-client postgresql-client apache-ant && rm -rf /var/cache/apk/* # JAVA_HOME is defined by default COPY run.sh /usr/local/bin/run COPY tomcat /usr/local/tomcat diff --git a/Dockerfile-centos b/Dockerfile-centos index 4d0fc5f..9d903fc 100644 --- a/Dockerfile-centos +++ b/Dockerfile-centos @@ -3,8 +3,7 @@ LABEL org.label-schema.name="simplicite" \ org.label-schema.vendor="Simplicite Software" \ org.label-schema.url="https://www.simplicite.io" \ org.label-schema.description="Simplicite server (centos)" -RUN yum upgrade -y && yum install -y epel-release && yum -y install bash git curl ca-certificates java-1.8.0-openjdk-devel ant mariadb postgresql postfix && yum clean all && rm -rf /var/cache/yum -RUN sed -i 's/^inet_protocols = all/inet_protocols = ipv4/' /etc/postfix/main.cf +RUN yum upgrade -y && yum install -y epel-release && yum -y install bash git curl ca-certificates java-1.8.0-openjdk-devel ant mariadb postgresql && yum clean all && rm -rf /var/cache/yum ENV JAVA_HOME /usr/lib/jvm/java-1.8.0 COPY run.sh /usr/local/bin/run COPY tomcat /usr/local/tomcat diff --git a/README.md b/README.md index c77b7ee..19ec272 100644 --- a/README.md +++ b/README.md @@ -101,8 +101,6 @@ Then, at each restart, it will upgrade the webapp from the template repository ( You can force the timezone of the application server by using `-e TOMCAT_TIMEZONE=` -You can start a local Postfix SMTP server by using `-e LOCAL_SMTP_SERVER=true` - You can adjust any other required JVM options by using `-e JAVA_OPTS=""` If you experience network issues within your container it is likely to be a DNS configuration issue diff --git a/run.sh b/run.sh index 0f4280e..7fd3e9b 100644 --- a/run.sh +++ b/run.sh @@ -7,13 +7,6 @@ echo " |___/_|_|_|_| .__/_|_\\__|_|\\__\\___(_)_\\___/" echo " |_|" echo "" -if [ "$LOCAL_SMTP_SERVER" = "true" ] -then - echo "Starting SMTP server..." - postfix start - echo "...done" -fi - TOMCAT_DIR=/usr/local/tomcat [ ! -d $TOMCAT_DIR/webapps ] && mkdir $TOMCAT_DIR/webapps