From 4ecbcfe8359869817fedbdeefdf79ee8b569953d Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 4 Mar 2018 20:04:47 +1100
Subject: [PATCH] Update to 7.2

---
 .gitlab-ci.yml    | 10 +++++-----
 Dockerfile        |  4 ++--
 sshd_config.patch | 20 --------------------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 sshd_config.patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da13e07..6c42892 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,18 +6,17 @@ stages:
 
 variables:
   BRANCH: ext
-  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 49f05fa..44eb5d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # NAME leenooks/php
-# VERSION 7.1-fpm-ext
+# VERSION 7.2-fpm-ext
 
-FROM registry.leenooks.net/leenooks/php:7.1-fpm-plus
+FROM registry.leenooks.net/leenooks/php:7.2-fpm-plus
 
 RUN echo "deb http://deb.debian.org/debian jessie non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
 	&& apt-get install -y pkg-config libsnmp-dev snmp-mibs-downloader --no-install-recommends \
diff --git a/sshd_config.patch b/sshd_config.patch
deleted file mode 100644
index a67df94..0000000
--- a/sshd_config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /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 @@
- 
- # Authentication:
- LoginGraceTime 120
--PermitRootLogin without-password
-+PermitRootLogin no
- StrictModes yes
- 
- RSAAuthentication yes
-@@ -49,7 +49,7 @@
- ChallengeResponseAuthentication no
- 
- # Change to no to disable tunnelled clear text passwords
--#PasswordAuthentication yes
-+PasswordAuthentication no
- 
- # Kerberos options
- #KerberosAuthentication no