Merge pull request #17 from xr09/exec-supervisor

Run supervisor using exec so it can become PID 1 instead of run.sh.
This commit is contained in:
Juan Luis Baptiste 2019-11-29 14:58:41 -05:00 committed by GitHub
commit 73c5c7deef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -10,13 +10,11 @@ RUN yum install -y epel-release && yum update -y && \
RUN sed -i -e "s/^nodaemon=false/nodaemon=true/" /etc/supervisord.conf 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 RUN sed -i -e 's/inet_interfaces = localhost/inet_interfaces = all/g' /etc/postfix/main.cf
COPY etc/*.conf /etc/ COPY etc/ /etc/
COPY etc/rsyslog.d/* /etc/rsyslog.d
COPY run.sh / COPY run.sh /
RUN chmod +x /run.sh RUN chmod +x /run.sh
COPY etc/supervisord.d/*.ini /etc/supervisord.d/
RUN newaliases RUN newaliases
EXPOSE 25 EXPOSE 25
#ENTRYPOINT ["/run.sh"] #ENTRYPOINT ["/run.sh"]
CMD ["/run.sh"] CMD ["/run.sh"]

2
run.sh
View File

@ -70,4 +70,4 @@ add_config_value "mynetworks" "${nets}"
# starting services # starting services
rm -f /var/spool/postfix/pid/master.pid rm -f /var/spool/postfix/pid/master.pid
supervisord exec supervisord