From e35e0fc17bd1324690b93302afd93fcc085d06f5 Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Mon, 2 Mar 2015 10:35:34 +0000 Subject: [PATCH] Adds ssmtp to nginx-php, closes #40 --- dockerfiles/services/nginx-php/Dockerfile | 4 ++++ dockerfiles/services/nginx-php/ssmtp.conf | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 dockerfiles/services/nginx-php/ssmtp.conf diff --git a/dockerfiles/services/nginx-php/Dockerfile b/dockerfiles/services/nginx-php/Dockerfile index 5d0c7d6..4d0bedc 100644 --- a/dockerfiles/services/nginx-php/Dockerfile +++ b/dockerfiles/services/nginx-php/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \ mysql-client \ php5-fpm \ php5-mysql \ + ssmtp \ curl && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /etc/nginx/conf.d/* && \ @@ -14,6 +15,7 @@ RUN apt-get update && apt-get install -y \ sed -i 's/access_log.*/access_log \/dev\/stdout;/g' /etc/nginx/nginx.conf && \ sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf && \ sed -i 's/^pid/daemon off;\npid/g' /etc/nginx/nginx.conf && \ + sed -i "s/.*sendmail_path.*/sendmail_path = \/usr\/sbin\/ssmtp -t/g" /etc/php5/fpm/php.ini && \ sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini ADD basic.conf /etc/nginx/conf.d/basic.conf @@ -23,6 +25,8 @@ RUN chmod u+x /opt/entrypoint.sh ADD mysql-check.sh /opt/mysql-check.sh RUN chmod u+x /opt/mysql-check.sh +COPY ssmtp.conf /etc/ssmtp/ssmtp.conf + ADD environment /etc/environment ENTRYPOINT ["/opt/entrypoint.sh"] diff --git a/dockerfiles/services/nginx-php/ssmtp.conf b/dockerfiles/services/nginx-php/ssmtp.conf new file mode 100644 index 0000000..aa6b53b --- /dev/null +++ b/dockerfiles/services/nginx-php/ssmtp.conf @@ -0,0 +1,4 @@ +mailhub=172.17.42.1 +root=postmaster +FromLineOverride=YES + -- GitLab