From 77c7e70428c25f7ba7b274c7732f126ac2e12838 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 27 Feb 2018 19:28:17 +1100
Subject: [PATCH] Reworked ssmtp integration, need to use fastcgi_param
 PHP_ADMIN_VALUE "sendmail_path=/usr/sbin/sendmail -i -t"; in nginx config,
 and hostname: for php container

---
 .gitlab-ci.yml |  2 +-
 Dockerfile     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd2f325..3fc8c22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 
 variables:
   BRANCH: mysql
-  VERSION: 7.1-fpm-${BRANCH}
+  VERSION: 7.2-fpm-${BRANCH}
   CACHETAG: build-${BRANCH}
   DOCKER_REGISTRY: registry.leenooks.net
   DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
diff --git a/Dockerfile b/Dockerfile
index 1f765c1..9e81d14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,11 @@
 # NAME leenooks/php
-# VERSION 7.1-fpm-mysql
+# VERSION 7.2-fpm-mysql
 
-FROM php:7.1-fpm
-RUN apt-get update && apt-get install -y openssh-server && rm -rf /var/lib/apt/lists/* /tmp/* \
-	&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp
+FROM php:7.2-fpm
+
+RUN apt-get update && apt-get install -y openssh-server ssmtp && rm -rf /var/lib/apt/lists/* /tmp/* \
+	&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp \
+	&& sed -i -e 's/^mailhub=mail$/mailhub=smtp/' -e "s/^hostname=/#hostname=/" -e 's/#FromLineOverride=YES/FromLineOverride=YES/' /etc/ssmtp/ssmtp.conf
 
 COPY sshd_config.patch /tmp
 RUN (cd / && patch -p0 ) < /tmp/sshd_config.patch && rm /tmp/sshd_config.patch