Skip to content

Remove unused Postfix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unused Postfix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<timezone, e.g. Europe/paris>`

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="<other JVM options, e.g. -Xms...>"`

If you experience network issues within your container it is likely to be a DNS configuration issue
Expand Down
7 changes: 0 additions & 7 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down