From ea8ce6edb60e7d0d8c7d3cc22a6cfaaada237e96 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Apr 2019 11:09:38 +0200
Subject: [PATCH] update README and Nextcloud to 14.0.9 and 15.0.6. Remove
 Nextcloud 13 (end of life)

---
 nextcloud/Dockerfile.13.0 | 76 ---------------------------------------
 nextcloud/Dockerfile.14.0 |  2 +-
 nextcloud/Dockerfile.15.0 |  2 +-
 nextcloud/README.md       |  3 +-
 4 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.13.0

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
deleted file mode 100644
index e849834..0000000
--- a/nextcloud/Dockerfile.13.0
+++ /dev/null
@@ -1,76 +0,0 @@
-FROM hoellen/nginx-php:7.2
-
-ARG NEXTCLOUD_VERSION=13.0.12
-ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
-
-ENV UID=991 GID=991 \
-    UPLOAD_MAX_SIZE=10G \
-    APC_SHM_SIZE=128M \
-    OPCACHE_MEM_SIZE=128 \
-    MEMORY_LIMIT=512M \
-    PHP_MAX_CHILDREN=15 \
-    PHP_START_SERVERS=2 \
-    PHP_MIN_SPARE_SERVERS=1 \
-    PHP_MAX_SPARE_SERVERS=6 \
-    CRON_PERIOD=15m \
-    CRON_MEMORY_LIMIT=1g \
-    TZ=Etc/UTC \
-    DB_TYPE=sqlite3 \
-    DOMAIN=localhost \
-    CHECK_PERMISSIONS=1
-
-RUN apk -U upgrade \
- && apk add -t build-dependencies \
-    gnupg \
-    tar \
-    build-base \
-    autoconf \
-    automake \
-    pcre-dev \
-    libtool \
-    samba-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    tzdata \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && mkdir /nextcloud \
- && cd /tmp \
- && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.asc \
- && wget -q https://nextcloud.com/nextcloud.asc \
- && echo "Verifying both integrity and authenticity of ${NEXTCLOUD_TARBALL}..." \
- && CHECKSUM_STATE=$(echo -n $(sha512sum -c ${NEXTCLOUD_TARBALL}.sha512) | tail -c 2) \
- && if [ "${CHECKSUM_STATE}" != "OK" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \
- && gpg --import nextcloud.asc \
- && FINGERPRINT="$(LANG=C gpg --verify ${NEXTCLOUD_TARBALL}.asc ${NEXTCLOUD_TARBALL} 2>&1 \
-  | sed -n "s#Primary key fingerprint: \(.*\)#\1#p")" \
- && if [ -z "${FINGERPRINT}" ]; then echo "Warning! Invalid GPG signature!" && exit 1; fi \
- && if [ "${FINGERPRINT}" != "${GPG_nextcloud}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
- && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \
- && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \
- && update-ca-certificates \
- && apk del build-dependencies \
- && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /data /config /apps2 /nextcloud/themes
-
-EXPOSE 8888
-
-LABEL description="A server software for creating file hosting services" \
-      nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
-      maintainer="hoellen <info@hoellen.eu>"
-
-CMD ["run.sh"]
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index a944856..1cd6ad8 100644
--- a/nextcloud/Dockerfile.14.0
+++ b/nextcloud/Dockerfile.14.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=14.0.8
+ARG NEXTCLOUD_VERSION=14.0.9
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index c757760..3061ce8 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=15.0.5
+ARG NEXTCLOUD_VERSION=15.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 82ef0b8..2a5042a 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -22,9 +22,10 @@
 
 ### Tags
 - **latest** : latest stable version (15.0)
+- **16.0** : latest 16.0.x version (beta)
 - **15.0** : latest 15.0.x version (stable)
 - **14.0** : latest 14.0.x version (old stable)
-- **13.0** : latest 13.0.x version (deprecated)
+- ~~**13.0** : latest 13.0.x version (end-of-life)~~
 - ~~**12.0** : latest 12.0.x version (end-of-life)~~
 - ~~**11.0** : latest 11.0.x version (end-of-life)~~
 - **daily** : latest code (daily build)