From 5bf33b84ee3644290527d6562705c655993062b0 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 27 Feb 2018 19:55:11 +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    | 10 +++++-----
 Dockerfile        |  4 ++--
 sshd_config.patch | 28 +++++++++++++---------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc4bd21..355f7bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,18 +6,17 @@ stages:
 
 variables:
   BRANCH: plus
-  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
+  DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
 
 services:
-- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
+- ${CI_REGISTRY}/leenooks/ci-docker:dind
 
 before_script:
 - docker info
 - docker version
-- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
+- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 
 test:
   stage: test
@@ -32,6 +31,7 @@ test:
 build:
   stage: build
   script:
+  - if [ -f init ]; then chmod 500 init; fi
   - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
   - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
diff --git a/Dockerfile b/Dockerfile
index d6e718e..42c7927 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # NAME leenooks/php
-# VERSION 7.1-fpm-plus
+# VERSION 7.2-fpm-plus
 
-FROM registry.leenooks.net/leenooks/php:7.1-fpm-mysql
+FROM registry.leenooks.net/leenooks/php:7.2-fpm-mysql
 
 RUN apt-get update \
 	&& apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickwand-dev --no-install-recommends \
diff --git a/sshd_config.patch b/sshd_config.patch
index a67df94..11f3ec4 100644
--- a/sshd_config.patch
+++ b/sshd_config.patch
@@ -1,20 +1,18 @@
---- /etc/ssh/sshd_config.orig    2017-12-13 10:12:21.098005827 +0000
-+++ /etc/ssh/sshd_config 2017-12-13 10:14:11.461687661 +0000
-@@ -25,7 +25,7 @@
+--- /etc/ssh/sshd_config.orig   2018-02-27 08:33:29.613104521 +0000
++++ /etc/ssh/sshd_config        2018-02-27 08:34:43.413485512 +0000
+@@ -30,6 +30,7 @@
  
- # Authentication:
- LoginGraceTime 120
--PermitRootLogin without-password
+ #LoginGraceTime 2m
+ #PermitRootLogin prohibit-password
 +PermitRootLogin no
- StrictModes yes
+ #StrictModes yes
+ #MaxAuthTries 6
+ #MaxSessions 10
+@@ -54,6 +55,7 @@
  
- RSAAuthentication yes
-@@ -49,7 +49,7 @@
- ChallengeResponseAuthentication no
- 
- # Change to no to disable tunnelled clear text passwords
--#PasswordAuthentication yes
+ # To disable tunneled clear text passwords, change to no here!
+ #PasswordAuthentication yes
 +PasswordAuthentication no
+ #PermitEmptyPasswords no
  
- # Kerberos options
- #KerberosAuthentication no
+ # Change to yes to enable challenge-response passwords (beware issues with