From ba385e766d1d6d546674eaa01f9f86bb369cecaf Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Mon, 16 Feb 2015 16:31:06 +0000 Subject: [PATCH] EOF --- dockerfiles/email/postfix/Dockerfile | 1 + dockerfiles/email/postfix/install.sh | 1 + dockerfiles/load-balancer/haproxy/Dockerfile | 1 + dockerfiles/services/apache/run.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/dockerfiles/email/postfix/Dockerfile b/dockerfiles/email/postfix/Dockerfile index 46142f1..1f806f0 100644 --- a/dockerfiles/email/postfix/Dockerfile +++ b/dockerfiles/email/postfix/Dockerfile @@ -23,3 +23,4 @@ VOLUME ["/etc/postfix", "/var/spool/mail", "/var/log"] EXPOSE 25 CMD /install.sh;/usr/bin/supervisord -c /etc/supervisor/supervisord.conf + diff --git a/dockerfiles/email/postfix/install.sh b/dockerfiles/email/postfix/install.sh index f1f71fc..a4e30bd 100755 --- a/dockerfiles/email/postfix/install.sh +++ b/dockerfiles/email/postfix/install.sh @@ -38,3 +38,4 @@ cp /data/forwards /etc/postfix/virtual # configure virtual postmap /etc/postfix/virtual + diff --git a/dockerfiles/load-balancer/haproxy/Dockerfile b/dockerfiles/load-balancer/haproxy/Dockerfile index 8d4cb5d..991ba67 100644 --- a/dockerfiles/load-balancer/haproxy/Dockerfile +++ b/dockerfiles/load-balancer/haproxy/Dockerfile @@ -13,3 +13,4 @@ ENTRYPOINT ["haproxy"] CMD ["-d", "-f", "/etc/haproxy/haproxy.cfg"] EXPOSE 80 EXPOSE 443 + diff --git a/dockerfiles/services/apache/run.sh b/dockerfiles/services/apache/run.sh index 5dccd01..81284de 100644 --- a/dockerfiles/services/apache/run.sh +++ b/dockerfiles/services/apache/run.sh @@ -1,3 +1,4 @@ #!/bin/bash source /etc/apache2/envvars exec apache2 -D FOREGROUND + -- GitLab