From 85a7b1a6ba89b960214e328aa338c1ae9334c7a3 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Thu, 24 May 2018 13:50:27 +0200
Subject: [PATCH] Move to a debian stretch and alpine 3.7 based base image

---
 Dockerfile-alpine.template |  2 +-
 Dockerfile-debian.template | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 64996ae..c5ddca5 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%
+FROM php:%%PHP_VERSION%%-%%VARIANT%%3.7
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index c2c4648..7a045f5 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%
+FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -29,7 +29,7 @@ RUN set -ex; \
         libldap2-dev \
         libmcrypt-dev \
         libmemcached-dev \
-        libpng12-dev \
+        libpng-dev \
         libpq-dev \
         libxml2-dev \
     ; \
@@ -96,6 +96,13 @@ VOLUME /var/www/html
 ENV NEXTCLOUD_VERSION %%VERSION%%
 
 RUN set -ex; \
+    fetchDeps=" \
+        gnupg \
+        dirmngr \
+    "; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends $fetchDeps; \
+    \
     curl -fsSL -o nextcloud.tar.bz2 \
         "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
@@ -110,7 +117,10 @@ RUN set -ex; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
-    chmod +x /usr/src/nextcloud/occ
+    chmod +x /usr/src/nextcloud/occ; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    rm -rf /var/lib/apt/lists/*
 
 COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/