From a34a47e05a4e68d0b99cc5439d3bdb1636677985 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 17:48:10 +0100
Subject: [PATCH 001/328] update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 42218486..cfa28c6d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # dockerfiles
-Discontinued. Fork at your will.
+Based on [Wonderfall Dockerfiles](https://github.com/Wonderfall/dockerfiles)

From 3368f21e7c112f111ab5be917a531683142f7eb0 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 17:49:48 +0100
Subject: [PATCH 002/328] Update nginx v1.13.7 - boring-nginx

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 3061dfdb..d6560a6a 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.6
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.5
+ARG NGINX_VERSION=1.13.7
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 

From 36ed843b26aff2903facc5a8792bb03aac2d5be5 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 17:51:39 +0100
Subject: [PATCH 003/328] Update nginx v1.13.7 - reverse

---
 reverse/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reverse/Dockerfile b/reverse/Dockerfile
index acc55a2e..23ee1c5d 100644
--- a/reverse/Dockerfile
+++ b/reverse/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.6
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.6
+ARG NGINX_VERSION=1.13.7
 ARG OPENSSL_VERSION=1.1.0g
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES

From 8a7be45d26e69bc5c10cc0c56809d5d92feeb716 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 17:52:31 +0100
Subject: [PATCH 004/328] Update nginx v1.13.7 - nginx-php

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 53d9763c..8d7591e5 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.6
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.6
+ARG NGINX_VER=1.13.7
 ARG PHP_VER=7.1.11
 ARG LIBICONV_VERSION=1.15
 

From 5f5dc353ecfdd874e6ed73aeef6cd86908ac0bc6 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 18:47:15 +0100
Subject: [PATCH 005/328] change some repository label from wonderfall to
 hoellen

---
 nextcloud/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index d926f919..cd36c22d 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -9,7 +9,7 @@
 
 ### Features
 - Based on Alpine Linux.
-- Bundled with nginx and PHP 7.1 (wonderfall/nginx-php image).
+- Bundled with nginx and PHP 7.1 (hoellen/nginx-php image).
 - Automatic installation using environment variables.
 - Package integrity (SHA512) and authenticity (PGP) checked during building process.
 - Data and apps persistence.
@@ -74,7 +74,7 @@ Basically, you can use a database instance running on the host or any other mach
 Pull the image and create a container. `/docker` can be anywhere on your host, this is just an example. Change `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` values (mariadb). You may also want to change UID and GID for Nextcloud, as well as other variables (see *Environment Variables*).
 
 ```
-docker pull wonderfall/nextcloud:10.0 && docker pull mariadb:10
+docker pull hoellen/nextcloud:12.0 && docker pull mariadb:10
 
 docker run -d --name db_nextcloud \
        -v /docker/nextcloud/db:/var/lib/mysql \
@@ -82,7 +82,7 @@ docker run -d --name db_nextcloud \
        -e MYSQL_DATABASE=nextcloud -e MYSQL_USER=nextcloud \
        -e MYSQL_PASSWORD=supersecretpassword \
        mariadb:10
-       
+
 docker run -d --name nextcloud \
        --link db_nextcloud:db_nextcloud \
        -v /docker/nextcloud/data:/data \
@@ -103,7 +103,7 @@ docker run -d --name nextcloud \
        -e DB_USER=nextcloud \
        -e DB_PASSWORD=supersecretpassword \
        -e DB_HOST=db_nextcloud \
-       wonderfall/nextcloud:10.0
+       hoellen/nextcloud:12.0
 ```
 
 You are **not obliged** to use `ADMIN_USER` and `ADMIN_PASSWORD`. If these variables are not provided, you'll be able to configure your admin acccount from your browser.
@@ -136,7 +136,7 @@ networks:
 
 services:
   nextcloud:
-    image: wonderfall/nextcloud
+    image: hoellen/nextcloud
     depends_on:
       - nextcloud-db           # If using MySQL
       - solr                   # If using Nextant
@@ -173,7 +173,7 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD=supersecretpassword
-    
+
   # If using Nextant
   solr:
     image: solr:6-alpine

From 32c073bd8a5a3dd1d98f0076aebb85dd80efefdb Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 18:49:41 +0100
Subject: [PATCH 006/328] change link from wonderfall docker repository to
 hoellen

---
 nextcloud/Dockerfile.11.0  | 2 +-
 nextcloud/Dockerfile.12.0  | 2 +-
 nextcloud/Dockerfile.daily | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.11.0 b/nextcloud/Dockerfile.11.0
index 3e55ba45..003a85d9 100644
--- a/nextcloud/Dockerfile.11.0
+++ b/nextcloud/Dockerfile.11.0
@@ -1,4 +1,4 @@
-FROM wonderfall/nginx-php:7.1
+FROM hoellen/nginx-php:7.1
 
 ARG NEXTCLOUD_VERSION=11.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 2624bf10..15bd71c2 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,4 +1,4 @@
-FROM wonderfall/nginx-php:7.1
+FROM hoellen/nginx-php:7.1
 
 ARG NEXTCLOUD_VERSION=12.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 4a4b23a7..a0346e98 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -1,4 +1,4 @@
-FROM wonderfall/nginx-php:7.1
+FROM hoellen/nginx-php:7.1
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \

From 8ce54d5e78c78b0a0059a80e66d3cfd4bd07cfdd Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 19:19:30 +0100
Subject: [PATCH 007/328] [nginx-php] update maintainer

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 8d7591e5..cf03074d 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -7,7 +7,7 @@ ARG PHP_VER=7.1.11
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>" \
+      maintainer="hoellen info@hoellen.eu" \
       php_version="PHP v$PHP_VER built from source" \
       nginx_version="nginx v$NGINX_VER built from source"
 

From a7f77ba0fc60c2f7d1d11b4988e6cf948c23ed27 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 19:34:41 +0100
Subject: [PATCH 008/328] [nginx-php] update php to 7.1.12

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index cf03074d..4efbfd50 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.6
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.7
-ARG PHP_VER=7.1.11
+ARG PHP_VER=7.1.12
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From cac1da445c6506bb9a68d66da2fed85a5389c701 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 20:48:00 +0100
Subject: [PATCH 009/328] [nginx-php] update alpine linux to 3.7

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 4efbfd50..180a5000 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 ARG BUILD_CORES
 

From 58a57f596434c24d1a9cac046412f5e9379eb82a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 22:49:54 +0100
Subject: [PATCH 010/328] [boring-nginx] update alpine to 3.7

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index d6560a6a..4792953a 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 ENV UID=991 GID=991
 

From f17f80da62a3b8d426f1784246993f6b2fbcb0e6 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 1 Dec 2017 23:19:22 +0100
Subject: [PATCH 011/328] [nextcloud] update maintainer

---
 nextcloud/Dockerfile.11.0  | 2 +-
 nextcloud/Dockerfile.12.0  | 2 +-
 nextcloud/Dockerfile.daily | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.11.0 b/nextcloud/Dockerfile.11.0
index 003a85d9..4348d84e 100644
--- a/nextcloud/Dockerfile.11.0
+++ b/nextcloud/Dockerfile.11.0
@@ -66,6 +66,6 @@ EXPOSE 8888
 
 LABEL description="A server software for creating file hosting services" \
       nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
+      maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]
diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 15bd71c2..6ca175bb 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -66,6 +66,6 @@ EXPOSE 8888
 
 LABEL description="A server software for creating file hosting services" \
       nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
+      maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index a0346e98..15dd0b01 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -55,6 +55,6 @@ EXPOSE 8888
 
 LABEL description="A server software for creating file hosting services" \
       nextcloud="Nextcloud daily" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
+      maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]

From 299c2198eb5820700156fbf74fe3afe289c2638e Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 3 Dec 2017 14:01:02 +0100
Subject: [PATCH 012/328] [boring-nginx] fix build problem (empty configuration
 lines)

---
 boring-nginx/Dockerfile | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 4792953a..0d2840f1 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -29,11 +29,7 @@ ARG NGINX_3RD_PARTY_MODULES=" \
     --add-module=/tmp/ngx_brotli"
 
 RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
-
-# Update system
  && apk -U upgrade \
-
-# Installing runtime dependencies
  && apk add \
     ${BUILD_DEPS} \
     pcre \
@@ -45,8 +41,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     libressl \
     bind-tools \
     tini \
-
-# Installing build dependencies
  && apk add -t build-dependencies \
     build-base \
     linux-headers \
@@ -63,17 +57,11 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     gnupg \
     cmake \
     go \
-
-# Brotli
  && cd /tmp && git clone https://github.com/bagder/libbrotli --depth=1 \
  && cd libbrotli && ./autogen.sh && ./configure && make -j ${NB_CORES} && make install \
  && cd /tmp && git clone https://github.com/google/ngx_brotli --depth=1 \
  && cd ngx_brotli && git submodule update --init \
-
-# Headers More
  && cd /tmp && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \
-
-# BoringSSL
  && git clone https://boringssl.googlesource.com/boringssl --depth=1 \
  && cd boringssl \
  && sed -i 's@out \([>=]\) TLS1_2_VERSION@out \1 TLS1_3_VERSION@' ssl/ssl_lib.cc \
@@ -86,8 +74,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && make -j ${NB_CORES} && cd .. \
  && mkdir -p .openssl/lib/ && cd .openssl && ln -s ../include && cd .. \
  && cp build/crypto/libcrypto.a build/ssl/libssl.a .openssl/lib && cd /tmp \
-
-# Nginx tarball checking
  && NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" \
  && wget -q https://nginx.org/download/${NGINX_TARBALL} \
  && echo "Verifying ${NGINX_TARBALL} using GPG..." \
@@ -100,16 +86,8 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
-
-# Nginx patch : dynamic TLS records
  && wget -q https://raw.githubusercontent.com/cujanovic/nginx-dynamic-tls-records-patch/master/nginx__dynamic_tls_records_1.13.0%2B.patch -O dynamic_records.patch \
  && patch -p1 < dynamic_records.patch \
-
-# Nginx full HPACK encoding support
-# && wget -q https://raw.githubusercontent.com/cloudflare/sslconfig/master/patches/nginx_1.13.1_http2_hpack.patch \
-# && patch -p1 < nginx_1.13.1_http2_hpack.patch \
-
-# Nginx compilation
  && ./configure \
     --prefix=/etc/nginx \
     --sbin-path=/usr/sbin/nginx \
@@ -121,8 +99,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     ${NGINX_3RD_PARTY_MODULES} \
  && make -j ${NB_CORES} && make install && make clean \
  && strip -s /usr/sbin/nginx \
-
-# Clean
  && apk del build-dependencies \
  && rm -rf /tmp/* /var/cache/apk/* /root/.gnupg
 

From 16a20ba3bc051db3de176d3a1d36640db07575ac Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 3 Dec 2017 14:05:16 +0100
Subject: [PATCH 013/328] [boring-nginx] downgrade alpine 3.7 cause of build
 problems

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 0d2840f1..4c6f3ef2 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.6
 
 ENV UID=991 GID=991
 

From f19488afcc52ad52e92dff3b7b0beb12dc72b136 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 3 Dec 2017 14:52:01 +0100
Subject: [PATCH 014/328] [nginx-php] downgrade alpine to 3.6

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 180a5000..4efbfd50 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.6
 
 ARG BUILD_CORES
 

From 461b7b820361f265cd10ae481ce05d333b3c3b4a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 3 Dec 2017 14:54:07 +0100
Subject: [PATCH 015/328] [nginx-php] delete empty lines because of build error
 (automated builds)

---
 nginx-php/7.1/Dockerfile | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 4efbfd50..86861519 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -122,8 +122,6 @@ ARG CUSTOM_PKGS=" \
 COPY rootfs /
 
 RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
-
-### Packages installation
  && BUILD_DEPS=" \
     linux-headers \
     libtool \
@@ -154,8 +152,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     pcre \
     zlib \
     ${CUSTOM_PKGS} \
-
-### Source downloading
  && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
  && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
  && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
@@ -166,26 +162,18 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
  && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
  && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
-
-### nginx installation
  && cd /usr/src/nginx-${NGINX_VER} \
  && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
  && make -j ${NB_CORES} \
  && make install \
-
-### GNU Libiconv installation
  && cd /usr/src/libiconv-${LIBICONV_VERSION} \
  && ./configure --prefix=/usr/local \
  && make && make install && libtool --finish /usr/local/lib \
-
-### PHP installation
  && mv /usr/src/php-${PHP_VER} /usr/src/php \
  && cd /usr/src/php \
  && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
  && make -j ${NB_CORES} \
  && make install \
-
-### Strip, clean, install modules
  && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
  && make clean \
  && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \

From 9f7f56d9ec65c1fccb653b5b083b92aa45b2b754 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Mon, 4 Dec 2017 11:50:02 +0100
Subject: [PATCH 016/328] [nextcloud] update to 12.0.4

---
 nextcloud/Dockerfile.12.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 6ca175bb..e5462c70 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.3
+ARG NEXTCLOUD_VERSION=12.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 3bd074f9d1f6d7452822f625c24b8bb910aabe98 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 4 Dec 2017 14:36:45 +0100
Subject: [PATCH 017/328] [cryptpad] update to 1.20.0

---
 cryptpad/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptpad/Dockerfile b/cryptpad/Dockerfile
index e3be8302..517fca0c 100644
--- a/cryptpad/Dockerfile
+++ b/cryptpad/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG VERSION=1.13.0
+ARG VERSION=1.20.0
 
 ENV UID=991 GID=991
 

From 88ac35c10b277c3ba885bfd6df82c8616e87b436 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 4 Dec 2017 14:54:24 +0100
Subject: [PATCH 018/328] UNMAINTENED

---
 unmaintained/cowrie/Dockerfile                | 77 +++++++++++++++++
 unmaintained/cowrie/README.md                 | 60 +++++++++++++
 unmaintained/cowrie/run.sh                    | 12 +++
 unmaintained/freshrss/Dockerfile              | 30 +++++++
 unmaintained/freshrss/README.md               | 24 ++++++
 .../freshrss/rootfs/etc/s6.d/cron/run         |  6 ++
 .../rootfs/nginx/sites-enabled/nginx.conf     | 33 ++++++++
 .../freshrss/rootfs/usr/local/bin/run.sh      |  8 ++
 unmaintained/ghost/Dockerfile                 | 43 ++++++++++
 unmaintained/ghost/README.md                  | 44 ++++++++++
 .../ghost/rootfs/etc/s6.d/.s6-svscan/finish   |  2 +
 unmaintained/ghost/rootfs/etc/s6.d/ghost/run  |  5 ++
 .../ghost/rootfs/usr/local/bin/run.sh         | 47 +++++++++++
 .../ghost/rootfs/usr/local/etc/disqus.conf    | 16 ++++
 .../rootfs/usr/local/etc/ghost.example.conf   | 21 +++++
 .../ghost/rootfs/usr/local/etc/isso.conf      |  7 ++
 unmaintained/kippo-graph/Dockerfile           | 47 +++++++++++
 unmaintained/kippo-graph/README.md            | 29 +++++++
 unmaintained/kippo-graph/nginx.conf           | 84 +++++++++++++++++++
 unmaintained/kippo-graph/php-fpm.conf         | 11 +++
 unmaintained/kippo-graph/run.sh               |  3 +
 .../kippo-graph/s6.d/.s6-svscan/finish        |  3 +
 unmaintained/kippo-graph/s6.d/nginx/run       |  2 +
 unmaintained/kippo-graph/s6.d/php/run         |  2 +
 unmaintained/mediawiki/Dockerfile             | 38 +++++++++
 unmaintained/mediawiki/README.md              | 69 +++++++++++++++
 .../rootfs/nginx/sites-enabled/nginx.conf     | 43 ++++++++++
 .../mediawiki/rootfs/php/conf.d/apcu.ini      |  4 +
 .../mediawiki/rootfs/usr/local/bin/run.sh     | 15 ++++
 unmaintained/parsoid/Dockerfile               | 28 +++++++
 unmaintained/parsoid/README.md                | 28 +++++++
 .../parsoid/rootfs/etc/s6.d/.s6-svscan/finish |  2 +
 .../parsoid/rootfs/etc/s6.d/parsoid/run       |  3 +
 .../parsoid/rootfs/usr/local/bin/run.sh       | 19 +++++
 .../parsoid/rootfs/usr/local/etc/disqus.conf  | 16 ++++
 .../rootfs/usr/local/etc/ghost.example.conf   | 21 +++++
 .../parsoid/rootfs/usr/local/etc/isso.conf    |  7 ++
 unmaintained/pgbouncer/Dockerfile             | 16 ++++
 unmaintained/pgbouncer/README.md              | 10 +++
 unmaintained/pgbouncer/run.sh                 |  4 +
 40 files changed, 939 insertions(+)
 create mode 100644 unmaintained/cowrie/Dockerfile
 create mode 100644 unmaintained/cowrie/README.md
 create mode 100644 unmaintained/cowrie/run.sh
 create mode 100644 unmaintained/freshrss/Dockerfile
 create mode 100644 unmaintained/freshrss/README.md
 create mode 100644 unmaintained/freshrss/rootfs/etc/s6.d/cron/run
 create mode 100644 unmaintained/freshrss/rootfs/nginx/sites-enabled/nginx.conf
 create mode 100644 unmaintained/freshrss/rootfs/usr/local/bin/run.sh
 create mode 100644 unmaintained/ghost/Dockerfile
 create mode 100644 unmaintained/ghost/README.md
 create mode 100644 unmaintained/ghost/rootfs/etc/s6.d/.s6-svscan/finish
 create mode 100644 unmaintained/ghost/rootfs/etc/s6.d/ghost/run
 create mode 100644 unmaintained/ghost/rootfs/usr/local/bin/run.sh
 create mode 100644 unmaintained/ghost/rootfs/usr/local/etc/disqus.conf
 create mode 100644 unmaintained/ghost/rootfs/usr/local/etc/ghost.example.conf
 create mode 100644 unmaintained/ghost/rootfs/usr/local/etc/isso.conf
 create mode 100644 unmaintained/kippo-graph/Dockerfile
 create mode 100644 unmaintained/kippo-graph/README.md
 create mode 100644 unmaintained/kippo-graph/nginx.conf
 create mode 100644 unmaintained/kippo-graph/php-fpm.conf
 create mode 100644 unmaintained/kippo-graph/run.sh
 create mode 100644 unmaintained/kippo-graph/s6.d/.s6-svscan/finish
 create mode 100644 unmaintained/kippo-graph/s6.d/nginx/run
 create mode 100644 unmaintained/kippo-graph/s6.d/php/run
 create mode 100644 unmaintained/mediawiki/Dockerfile
 create mode 100644 unmaintained/mediawiki/README.md
 create mode 100644 unmaintained/mediawiki/rootfs/nginx/sites-enabled/nginx.conf
 create mode 100644 unmaintained/mediawiki/rootfs/php/conf.d/apcu.ini
 create mode 100644 unmaintained/mediawiki/rootfs/usr/local/bin/run.sh
 create mode 100644 unmaintained/parsoid/Dockerfile
 create mode 100644 unmaintained/parsoid/README.md
 create mode 100644 unmaintained/parsoid/rootfs/etc/s6.d/.s6-svscan/finish
 create mode 100644 unmaintained/parsoid/rootfs/etc/s6.d/parsoid/run
 create mode 100644 unmaintained/parsoid/rootfs/usr/local/bin/run.sh
 create mode 100644 unmaintained/parsoid/rootfs/usr/local/etc/disqus.conf
 create mode 100644 unmaintained/parsoid/rootfs/usr/local/etc/ghost.example.conf
 create mode 100644 unmaintained/parsoid/rootfs/usr/local/etc/isso.conf
 create mode 100644 unmaintained/pgbouncer/Dockerfile
 create mode 100644 unmaintained/pgbouncer/README.md
 create mode 100644 unmaintained/pgbouncer/run.sh

diff --git a/unmaintained/cowrie/Dockerfile b/unmaintained/cowrie/Dockerfile
new file mode 100644
index 00000000..16964ee5
--- /dev/null
+++ b/unmaintained/cowrie/Dockerfile
@@ -0,0 +1,77 @@
+FROM alpine:edge
+
+ARG MPFR_VERSION=3.1.5
+ARG MPC_VERSION=1.0.3
+
+ARG GPG_MPFR="07F3 DBBE CC1A 3960 5078  094D 980C 1976 98C3 739D"
+ARG GPG_MPC="AD17 A21E F8AE D8F1 CC02  DBD9 F7D5 C9BF 765C 61E3"
+ARG SHA1_MPC="b8be66396c726fdc36ebb0f692ed8a8cca3bcc66"
+
+ENV UID=991 GID=991
+
+RUN BUILD_DEPS=" \
+    build-base \
+    libtool \
+    libffi-dev \
+    libressl-dev \
+    python-dev \
+    gmp-dev \
+    mariadb-dev \
+    py2-pip \
+    tar \
+    gnupg" \
+ && apk -U upgrade && apk add \
+    ${BUILD_DEPS} \
+    libffi \
+    gmp \
+    libressl \
+    python \
+    py-setuptools \
+    openssh-client \
+    mariadb-client-libs \
+    tini \
+    su-exec \
+ && cd /tmp && wget -q http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.gz \
+ && echo "Verifying authenticity of mpfr-${MPFR_VERSION}.tar.gz..." \
+ && wget -q http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.gz.asc \
+ && gpg --recv-keys 98C3739D \
+ && FINGERPRINT="$(LANG=C gpg --verify mpfr-${MPFR_VERSION}.tar.gz.asc mpfr-${MPFR_VERSION}.tar.gz 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_MPFR}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
+ && echo "All seems good, now unpacking mpfr-${MPFR_VERSION}.tar.gz..." \
+ && tar xzf mpfr-${MPFR_VERSION}.tar.gz && cd mpfr-${MPFR_VERSION} \
+ && ./configure && make && make install \
+ && cd /tmp && wget -q ftp://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz \
+ && echo "Verifying both integrity and authenticity of mpc-${MPC_VERSION}.tar.gz..." \
+ && CHECKSUM=$(sha1sum mpc-${MPC_VERSION}.tar.gz | awk '{print $1}') \
+ && if [ "${CHECKSUM}" != "${SHA1_MPC}" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \
+ && wget -q ftp://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz.sig \
+ && gpg --recv-keys 0xF7D5C9BF765C61E3 \
+ && FINGERPRINT="$(LANG=C gpg --verify mpc-${MPC_VERSION}.tar.gz.sig mpc-${MPC_VERSION}.tar.gz 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_MPC}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
+ && echo "All seems good, now unpacking mpc-${MPC_VERSION}.tar.gz..." \
+ && tar xzf mpc-${MPC_VERSION}.tar.gz && cd mpc-${MPC_VERSION} \
+ && ./configure --with-mpfr-lib=/usr/local/lib --with-mpfr-include=/usr/local/include \
+ && make && make install \
+ && mkdir /cowrie && cd /cowrie \
+ && wget -qO- https://github.com/micheloosterhof/cowrie/archive/master.tar.gz | tar xz --strip 1 \
+ && pip install --no-cache -r requirements.txt \
+ && pip install --no-cache mysql-python \
+ && mv cowrie.cfg.dist cowrie.cfg \
+ && apk del ${BUILD_DEPS} \
+ && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
+
+COPY run.sh /usr/local/bin/run.sh
+
+RUN chmod +x /usr/local/bin/run.sh
+
+VOLUME /cowrie/log /cowrie/dl /custom
+
+EXPOSE 2222
+
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
+CMD ["run.sh"]
diff --git a/unmaintained/cowrie/README.md b/unmaintained/cowrie/README.md
new file mode 100644
index 00000000..b6253028
--- /dev/null
+++ b/unmaintained/cowrie/README.md
@@ -0,0 +1,60 @@
+### wonderfall/cowrie
+
+#### What is this?
+Cowrie is a medium interaction SSH honeypot designed to log brute force attacks and the shell interaction performed by the attacker. Cowrie is based on Kippo.
+
+#### Build-time variables
+- **MPFR_VERSION** : GNU MPFR version.
+- **MPC_VERSION** : GNU MPC version.
+- **GPG_** : fingerprints of signing keys.
+- **SHA_** : fingerprints of tarballs
+
+#### Environment variables
+- **UID** *(default : 991)*
+- **GID** *(default : 991)*
+
+#### How to configure
+You should provide your own configuration file from this base : https://raw.githubusercontent.com/micheloosterhof/cowrie/master/cowrie.cfg.dist
+You can mount this single file to your Docker container.
+
+#### Volumes
+- **/cowrie/dl** : where downloads are stored.
+- **/cowrie/log** : cowrie and tty sessions logs.
+- **/cowrie/cowrie.cfg** : cowrie configuration file. **Provide yours!**
+- **/custom** : customize cowrie structure with your own files
+
+#### Docker compose (example)
+```
+cowrie:
+  image: wonderfall/cowrie
+  links:                           ### MySQL output
+    - cowrie-db:cowrie-db          ### MySQL output
+  ports:
+    - "2222:2222"
+  volumes:
+    - /mnt/cowrie/dl:/cowrie/dl
+    - /mnt/cowrie/log:/cowrie/log
+    - /mnt/cowrie/custom:/custom
+    - /mnt/cowrie/cowrie.cfg:/cowrie/cowrie.cfg
+  environment:
+    - GID=1000
+    - UID=1000
+
+### MySQL output
+# First, you'll have to initialise tables with a .sql file
+# mkdir -p /mnt/cowrie/sql
+# wget https://raw.githubusercontent.com/micheloosterhof/cowrie/master/doc/sql/mysql.sql -P /mnt/cowrie/sql/cowrie.sql
+# It needs also to be configured in the cowrie.cfg file
+
+cowrie-db:
+  image: mariadb:10
+  volumes:
+    - /mnt/cowrie/db:/var/lib/mysql
+    - /mnt/cowrie/sql:/docker-entrypoint-initdb.d
+  environment:
+    - MYSQL_ROOT_PASSWORD=supersecretpassword
+    - MYSQL_DATABASE=cowrie
+    - MYSQL_USER=cowrie
+    - MYSQL_PASSWORD=supersecretpassword
+```
+
diff --git a/unmaintained/cowrie/run.sh b/unmaintained/cowrie/run.sh
new file mode 100644
index 00000000..e4321e0b
--- /dev/null
+++ b/unmaintained/cowrie/run.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd /cowrie
+
+rm twistd.pid &>/dev/null
+mkdir -p /cowrie/log/tty &>/dev/null
+cp -R /custom/* /cowrie &>/dev/null
+chown -R $UID:$GID /cowrie
+
+COWRIEDIR=$(dirname $0)
+export PYTHONPATH=${PYTHONPATH}:${COWRIEDIR}
+
+exec su-exec $UID:$GID /sbin/tini -- twistd -n -l /cowrie/log/cowrie.log cowrie
diff --git a/unmaintained/freshrss/Dockerfile b/unmaintained/freshrss/Dockerfile
new file mode 100644
index 00000000..75e2d5fb
--- /dev/null
+++ b/unmaintained/freshrss/Dockerfile
@@ -0,0 +1,30 @@
+FROM wonderfall/nginx-php:7.1
+
+ARG FRESHRSS_VER=1.8.0
+
+ENV UID=991 GID=991 \
+    UPLOAD_MAX_SIZE=10M \
+    MEMORY_LIMIT=128M \
+    CRON_PERIOD=30m
+
+RUN apk -U add --no-cache \
+    tar \
+    libressl \
+    ca-certificates \
+ && mkdir freshrss && cd freshrss \
+ && wget -qO- https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VER}.tar.gz | tar xz --strip 1 \
+ && mv data data_tmp
+
+COPY rootfs /
+
+RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+VOLUME /freshrss/data /php/session
+
+EXPOSE 8888
+
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
+      description="A free, self-hostable aggregator" \
+      version="FreshRSS ${FRESHRSS_VER}"
+
+CMD ["run.sh"]
diff --git a/unmaintained/freshrss/README.md b/unmaintained/freshrss/README.md
new file mode 100644
index 00000000..82bdf7f7
--- /dev/null
+++ b/unmaintained/freshrss/README.md
@@ -0,0 +1,24 @@
+## wonderfall/freshrss
+
+A free, self-hostable aggregator : https://github.com/FreshRSS/FreshRSS
+
+#### Features
+- Based on Alpine Linux (wonderfall/nginx-php image)
+- Bundled with nginx and PHP7.1.
+- Automatic feed update (frequency at 30 minutes by default)
+
+#### Build-time variables
+- **FRESHRSS_VER** : version of FreshRSS
+
+#### Environment variables
+- **UID** : user id
+- **GID** : group id
+- **MEMORY_LIMIT** : php memory limit *(default : 128M)*
+- **UPLOAD_MAX_SIZE** : maximum upload size *(default : 10M)*
+- **CRON_PERIOD** : feed update frequency *(default : 30m)*
+
+#### Volumes
+- **/freshrss/data**
+
+#### Ports
+- **8888** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
diff --git a/unmaintained/freshrss/rootfs/etc/s6.d/cron/run b/unmaintained/freshrss/rootfs/etc/s6.d/cron/run
new file mode 100644
index 00000000..584e453f
--- /dev/null
+++ b/unmaintained/freshrss/rootfs/etc/s6.d/cron/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while true; do
+  php -f /freshrss/app/actualize_script.php
+  sleep <CRON_PERIOD>
+done
diff --git a/unmaintained/freshrss/rootfs/nginx/sites-enabled/nginx.conf b/unmaintained/freshrss/rootfs/nginx/sites-enabled/nginx.conf
new file mode 100644
index 00000000..69977bc9
--- /dev/null
+++ b/unmaintained/freshrss/rootfs/nginx/sites-enabled/nginx.conf
@@ -0,0 +1,33 @@
+server {
+        listen 8888;
+        root /freshrss;
+        index index.php index.html;
+
+        location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
+            expires 30d;
+            access_log off;
+	}
+
+        location ~ ^/(data|cfg|tmp) {                                        
+            deny all;                                                        
+        }                                                                    
+                                                                             
+        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {  
+            deny all;                                                        
+        } 
+    
+        location ~ /\. {
+            deny all;
+        }
+
+        location / {
+	    try_files $uri $uri/ /index.php;
+        }
+
+	location ~ \.php$ {
+            fastcgi_index index.php;
+            fastcgi_pass unix:/php/run/php-fpm.sock;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /nginx/conf/fastcgi_params;
+	}
+}
diff --git a/unmaintained/freshrss/rootfs/usr/local/bin/run.sh b/unmaintained/freshrss/rootfs/usr/local/bin/run.sh
new file mode 100644
index 00000000..e61bfaa7
--- /dev/null
+++ b/unmaintained/freshrss/rootfs/usr/local/bin/run.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
+       -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
+
+[ ! "$(ls -A /freshrss/data)" ] && cp -R /freshrss/data_tmp/* /freshrss/data/
+chown -R $UID:$GID /freshrss /nginx /php /tmp /etc/s6.d
+exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/unmaintained/ghost/Dockerfile b/unmaintained/ghost/Dockerfile
new file mode 100644
index 00000000..84bd2c73
--- /dev/null
+++ b/unmaintained/ghost/Dockerfile
@@ -0,0 +1,43 @@
+FROM alpine:3.6
+
+ARG VERSION=1.14.0
+
+ENV GHOST_NODE_VERSION_CHECK=false \
+    NODE_ENV=production \
+    GID=991 UID=991 \
+    ADDRESS=https://my-ghost-blog.com \
+    ENABLE_ISSO=False \
+    ISSO_HOST=isso.domain.tld \
+    ISSO_AVATAR=false \
+    ISSO_VOTE=false
+
+WORKDIR /ghost
+
+RUN apk -U --no-cache add \
+    bash \
+    ca-certificates \
+    grep \
+    libressl \
+    nodejs-current \
+    nodejs-current-npm \
+    s6 \
+    su-exec \
+    vim \
+ && wget -q https://github.com/TryGhost/Ghost/releases/download/${VERSION}/Ghost-${VERSION}.zip -P /tmp \
+ && unzip -q /tmp/Ghost-${VERSION}.zip -d /ghost \
+ && npm install --production \
+ && mv content/themes/casper casper
+
+COPY rootfs /
+
+RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+EXPOSE 2368
+
+VOLUME /ghost/content
+
+LABEL description="Ghost CMS ${VERSION}" \
+      maintainer="Wonderfall <wonderfall@targaryen.house>"
+
+ENTRYPOINT ["run.sh"]
+CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/unmaintained/ghost/README.md b/unmaintained/ghost/README.md
new file mode 100644
index 00000000..1ed3d58e
--- /dev/null
+++ b/unmaintained/ghost/README.md
@@ -0,0 +1,44 @@
+## wonderfall/ghost
+
+![](https://i.goopics.net/lt.png)
+
+**Breaking changes if you're upgrading from 0.x. Please export your current data, and import them again in a new 1.x blog. You also have to move your images to the new volume if you want to keep them. Disqus is also not supported, please move to Isso, a much better comments system. Sorry for the mess!**
+
+#### What is this? What features?
+- A **simple** Ghost CMS build made for production.
+- Based on Alpine Linux so it's lightweight!
+- Bundled with latest node.js available (version check is disabled).
+- Offers Isso integration.
+
+#### Build-time variables
+- **VERSION** : version of Ghost.
+
+#### Environment variables
+- **GID** : ghost user id *(default : 991)*
+- **UID** : ghost group id *(default : 991)*
+- **ADDRESS** : your domain (with *http(s)://*) *(default : https://my-ghost-blog.com)*
+- **ENABLE_ISSO** : enables Isso support if set to *True* *(default : False)*
+- **ISSO_HOST**, **ISSO_AVATAR**, **ISSO_VOTE** : Isso settings (*True* or *False*)
+
+#### Volumes
+- **/ghost/content** : contents of your blog
+
+### Ports
+- **2368** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
+
+### How to configure?
+Everything you need is in `/ghost/content/ghost.conf` (also mounted on your host...).
+
+### docker-compose.yml sample
+
+```
+ghost-myblog:
+  image: wonderfall/ghost:1
+  container_name: ghost-myblog
+  environment:
+    - UID=8100
+    - GID=8100
+    - ADDRESS=https://myblog.com
+  volumes:
+    - /mnt/docker/myblog:/ghost/content
+```
diff --git a/unmaintained/ghost/rootfs/etc/s6.d/.s6-svscan/finish b/unmaintained/ghost/rootfs/etc/s6.d/.s6-svscan/finish
new file mode 100644
index 00000000..039e4d00
--- /dev/null
+++ b/unmaintained/ghost/rootfs/etc/s6.d/.s6-svscan/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/unmaintained/ghost/rootfs/etc/s6.d/ghost/run b/unmaintained/ghost/rootfs/etc/s6.d/ghost/run
new file mode 100644
index 00000000..d24cf267
--- /dev/null
+++ b/unmaintained/ghost/rootfs/etc/s6.d/ghost/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd /ghost
+NODE_ENV=development node_modules/.bin/knex-migrator init
+NODE_ENV=development node_modules/.bin/knex-migrator migrate
+exec npm start
diff --git a/unmaintained/ghost/rootfs/usr/local/bin/run.sh b/unmaintained/ghost/rootfs/usr/local/bin/run.sh
new file mode 100644
index 00000000..a6d86ea4
--- /dev/null
+++ b/unmaintained/ghost/rootfs/usr/local/bin/run.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+echo
+echo ">>> wonderfall/ghost container <<<"
+echo
+
+echo "> Initializing content folder..."
+cd content
+mkdir apps data images themes logs adapters &>/dev/null
+rm -rf /ghost/content/themes/casper &>/dev/null
+cp -r /ghost/casper themes/casper &>/dev/null
+cd /ghost
+
+if [ ! -f /ghost/content/ghost.conf ]; then
+  echo
+  echo "INFO : No configuration file was provided, an example will be used"
+  echo "       You can access and modify it in the volume you mounted"
+  echo "       Restart in order to apply your changes!"
+  echo
+  mv /usr/local/etc/ghost.example.conf /ghost/content/ghost.conf
+fi
+
+if [ ! -f /ghost/config.production.json ]; then
+  ln -s content/ghost.conf config.production.json
+fi
+
+echo "> Applying preferences..."
+
+sed -i -e "s|https://my-ghost-blog.com|${ADDRESS}|g" /ghost/content/ghost.conf
+
+if [ "$ENABLE_ISSO" == "True" ] && ! grep -q 'isso' /ghost/content/themes/casper/post.hbs; then
+    cd /usr/local/etc
+    sed -i -e "/\/author/r isso.conf" /ghost/content/themes/casper/post.hbs
+    sed -i -e '/isso-thread/{n;d}' /ghost/content/themes/casper/post.hbs
+    sed -i -e "s/<HOST>/$ISSO_HOST/g" \
+           -e "s/<AVATAR>/$ISSO_AVATAR/g" \
+           -e "s/<VOTE>/$ISSO_VOTE/g" /ghost/content/themes/casper/post.hbs
+fi
+
+echo "> Updating permissions..."
+chown -R ${UID}:${GID} /ghost /etc/s6.d
+
+echo "> Executing process..."
+if [ '$@' == '' ]; then
+    exec su-exec ${UID}:${GID} /bin/s6-svscan /etc/s6.d
+else
+    exec su-exec ${UID}:${GID} "$@"
+fi
diff --git a/unmaintained/ghost/rootfs/usr/local/etc/disqus.conf b/unmaintained/ghost/rootfs/usr/local/etc/disqus.conf
new file mode 100644
index 00000000..9b205328
--- /dev/null
+++ b/unmaintained/ghost/rootfs/usr/local/etc/disqus.conf
@@ -0,0 +1,16 @@
+
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    var disqus_shortname = '<SHORTNAME>';
+    var disqus_identifier = '{{post.id}}';
+ 
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+
diff --git a/unmaintained/ghost/rootfs/usr/local/etc/ghost.example.conf b/unmaintained/ghost/rootfs/usr/local/etc/ghost.example.conf
new file mode 100644
index 00000000..2b010240
--- /dev/null
+++ b/unmaintained/ghost/rootfs/usr/local/etc/ghost.example.conf
@@ -0,0 +1,21 @@
+{
+  "url": "https://my-ghost-blog.com",
+
+  "server": {
+    "host": "0.0.0.0",
+    "port": "2368"
+  },
+
+  "database": {
+    "client": "sqlite3",
+    "connection": {
+      "filename": "content/data/ghost-dev.db"
+    },
+    "useNullAsDefault": true,
+    "debug": false
+  },
+
+  "mail": {
+    "transport": "Direct"
+  }
+}
diff --git a/unmaintained/ghost/rootfs/usr/local/etc/isso.conf b/unmaintained/ghost/rootfs/usr/local/etc/isso.conf
new file mode 100644
index 00000000..4287ebcd
--- /dev/null
+++ b/unmaintained/ghost/rootfs/usr/local/etc/isso.conf
@@ -0,0 +1,7 @@
+</footer>
+<script data-isso="//<HOST>/"
+        data-isso-avatar="<AVATAR>"
+        data-isso-vote="<VOTE>"
+        src="//<HOST>/js/embed.min.js"></script>
+
+<section id="isso-thread"></section>
diff --git a/unmaintained/kippo-graph/Dockerfile b/unmaintained/kippo-graph/Dockerfile
new file mode 100644
index 00000000..70443d0a
--- /dev/null
+++ b/unmaintained/kippo-graph/Dockerfile
@@ -0,0 +1,47 @@
+FROM alpine:edge
+
+ENV GID=991 UID=991
+
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+ && BUILD_DEPS="tar libressl ca-certificates" \
+ && apk -U upgrade && apk add \
+    $BUILD_DEPS \
+    nginx \
+    s6 \
+    su-exec \
+    coreutils \
+    bind-tools \
+    php7-fpm@testing \
+    php7-mysqlnd@testing \
+    php7-pdo@testing \
+    php7-pdo_mysql@testing \
+    php7-openssl@testing \
+    php7-gd@testing \
+    php7-curl@testing \
+    php7-phar@testing \
+    php7-dom@testing \
+ && mkdir kippo-graph && cd kippo-graph \
+ && wget -qO- https://github.com/ikoniaris/kippo-graph/archive/master.tar.gz | tar xz --strip 1 \
+ && chmod 777 generated-graphs \
+ && mv config.php.dist config.php \
+ && rm /kippo-graph/include/maxmind/GeoLite2-City.mmdb /kippo-graph/include/maxmind/geoip2.phar \
+ && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz -P /kippo-graph/include/maxmind \
+ && gzip -d /kippo-graph/include/maxmind/GeoLite2-City.mmdb.gz \
+ && wget -q https://github.com/maxmind/GeoIP2-php/releases/download/v2.4.5/geoip2.phar -P /kippo-graph/include/maxmind \
+ && apk del $BUILD_DEPS \
+ && rm -f /var/cache/apk/*
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY php-fpm.conf /etc/php7/php-fpm.conf
+COPY run.sh /usr/local/bin/run.sh
+COPY s6.d /etc/s6.d
+
+RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+VOLUME /kippo-graph/generated-graphs
+
+EXPOSE 8888
+
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
+CMD ["run.sh"]
diff --git a/unmaintained/kippo-graph/README.md b/unmaintained/kippo-graph/README.md
new file mode 100644
index 00000000..2689b465
--- /dev/null
+++ b/unmaintained/kippo-graph/README.md
@@ -0,0 +1,29 @@
+### wonderfall/kippo-graph
+
+![kippo-graph](https://github.com/ikoniaris/kippo-graph/blob/master/images/kippo-graph-img.png)
+
+#### What is this?
+Kippo-Graph is a full featured script to visualize statistics for a Kippo based SSH honeypot.
+
+#### Environment variables
+- **UID** *(default : 991)*
+- **GID** *(default : 991)*
+
+#### How to configure
+You should provide your own configuration file from this base : https://github.com/ikoniaris/kippo-graph/blob/master/config.php.dist
+You can mount this single file to your Docker container.
+
+#### Docker compose (example)
+```
+kippo-graph:
+  image: wonderfall/kippo-graph
+  links:
+    - cowrie-db:cowrie-db
+  volumes:
+    - /mnt/kippo-graph/config.php:/kippo-graph/config.php
+    - /mnt/cowrie/log:/opt/cowrie/log
+  environment:
+    - GID=991
+    - UID=991
+```
+
diff --git a/unmaintained/kippo-graph/nginx.conf b/unmaintained/kippo-graph/nginx.conf
new file mode 100644
index 00000000..100f66ab
--- /dev/null
+++ b/unmaintained/kippo-graph/nginx.conf
@@ -0,0 +1,84 @@
+worker_processes auto;
+pid /tmp/nginx.pid;
+daemon off;
+
+events {
+    worker_connections 1024; 
+    use epoll;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    access_log off;
+    error_log /tmp/ngx_error.log error;
+    
+    sendfile on;
+    keepalive_timeout 15;
+    keepalive_disable msie6;
+    keepalive_requests 100;
+    tcp_nopush on;
+    tcp_nodelay on;
+    server_tokens off;
+
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
+    
+    gzip on;
+    gzip_comp_level 5;
+    gzip_min_length 512;
+    gzip_buffers 4 8k;
+    gzip_proxied any;
+    gzip_vary on;
+    gzip_disable "msie6";
+    gzip_types
+        text/css
+        text/javascript
+        text/xml
+        text/plain
+        text/x-component
+        application/javascript
+        application/x-javascript
+        application/json
+        application/xml
+        application/rss+xml
+        application/vnd.ms-fontobject
+        font/truetype
+        font/opentype
+        image/svg+xml;
+
+    server {
+    	listen 8888;
+    	root /kippo-graph;
+    	index index.php index.html;
+
+        location ~ ^/(data|cfg|tmp) {                                        
+            deny all;                                                        
+        }                                                                    
+                                                                             
+        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {  
+            deny all;                                                        
+        } 
+    
+        location ~ /\. {
+            deny all;
+        }
+
+    	location / {
+        	try_files $uri $uri/ /index.php;
+    	}
+
+	location ~ \.php$ {
+    		fastcgi_index index.php;
+    		fastcgi_pass unix:/tmp/php-fpm.sock;
+    		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    		include /etc/nginx/fastcgi_params;
+	}
+
+    }
+
+}
diff --git a/unmaintained/kippo-graph/php-fpm.conf b/unmaintained/kippo-graph/php-fpm.conf
new file mode 100644
index 00000000..f636044d
--- /dev/null
+++ b/unmaintained/kippo-graph/php-fpm.conf
@@ -0,0 +1,11 @@
+[global]
+daemonize = no
+
+[www]
+listen = /tmp/php-fpm.sock
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+chdir = /
diff --git a/unmaintained/kippo-graph/run.sh b/unmaintained/kippo-graph/run.sh
new file mode 100644
index 00000000..97e5f9a8
--- /dev/null
+++ b/unmaintained/kippo-graph/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+chown -R $UID:$GID /kippo-graph /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
+exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/unmaintained/kippo-graph/s6.d/.s6-svscan/finish b/unmaintained/kippo-graph/s6.d/.s6-svscan/finish
new file mode 100644
index 00000000..c52d3c26
--- /dev/null
+++ b/unmaintained/kippo-graph/s6.d/.s6-svscan/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
diff --git a/unmaintained/kippo-graph/s6.d/nginx/run b/unmaintained/kippo-graph/s6.d/nginx/run
new file mode 100644
index 00000000..eaf80495
--- /dev/null
+++ b/unmaintained/kippo-graph/s6.d/nginx/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec nginx
diff --git a/unmaintained/kippo-graph/s6.d/php/run b/unmaintained/kippo-graph/s6.d/php/run
new file mode 100644
index 00000000..e238021f
--- /dev/null
+++ b/unmaintained/kippo-graph/s6.d/php/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec php-fpm7
diff --git a/unmaintained/mediawiki/Dockerfile b/unmaintained/mediawiki/Dockerfile
new file mode 100644
index 00000000..b563e160
--- /dev/null
+++ b/unmaintained/mediawiki/Dockerfile
@@ -0,0 +1,38 @@
+FROM wonderfall/nginx-php:7.1
+
+ARG MEDIAWIKI_VER=1.29
+ARG SUB_VERSION=1
+
+ENV UID=991 GID=991 \
+    UPLOAD_MAX_SIZE=10M \
+    MEMORY_LIMIT=128M
+
+RUN apk -U add \
+    tar \
+    libressl \
+    ca-certificates \
+    git \
+    lua \
+    coreutils \
+    diffutils \
+    build-base \
+    autoconf \
+ && pecl install apcu \
+ && mkdir mediawiki && cd mediawiki \
+ && wget -qO- https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_VER}/mediawiki-${MEDIAWIKI_VER}.${SUB_VERSION}.tar.gz | tar xz --strip 1 \
+ && apk del build-base autoconf \
+ && rm -rf /var/cache/apk/*
+
+COPY rootfs /
+
+RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+VOLUME /config /skins /extensions /mediawiki/images /php/session
+
+EXPOSE 8888
+
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
+      description="MediaWiki is a free software open source wiki package written in PHP" \
+      version="MediaWiki ${MEDIAWIKI_VER}.${SUB_VERSION}"
+
+CMD ["run.sh"]
diff --git a/unmaintained/mediawiki/README.md b/unmaintained/mediawiki/README.md
new file mode 100644
index 00000000..c6b64cd3
--- /dev/null
+++ b/unmaintained/mediawiki/README.md
@@ -0,0 +1,69 @@
+## wonderfall/mediawiki
+
+Host your own Wiki!
+
+#### Features
+- Based on Alpine Linux (wonderfall/nginx-php image)
+- Bundled with nginx and PHP7.1.
+
+#### Build-time variables
+- **MEDIAWIKI_VER** : Mediawiki version
+- **SUB_VERSION** : Mediawiki subversion
+
+#### Environment variables
+- **UID** : privatebin user id
+- **GID** : privatebin group id
+- **MEMORY_LIMIT** : php memorny limit *(default : 128M)*
+- **UPLOAD_MAX_SIZE** : maximum upload size *(default : 10M)*
+
+#### Volumes
+- /mediawiki/images
+- /extensions
+- /skins
+- /config
+- /mediawiki/custom
+
+#### Ports
+- **8888** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
+
+#### docker-compose.yml sample
+
+```
+mywiki:
+  image: wonderfall/mediawiki
+  container_name: mywiki
+  links:
+    - mywiki-db:mywiki-db
+    - mywiki-parsoid:mywiki-parsoid
+  environment:
+    - UPLOAD_MAX_SIZE=20M
+    - MEMORY_LIMIT=512M
+    - UID=1668
+    - GID=1668
+  volumes:
+    - /mnt/mywiki/images:/mediawiki/images
+    - /mnt/mywiki/extensions:/extensions
+    - /mnt/mywiki/skins:/skins
+    - /mnt/mywiki/config:/config
+    - /mnt/mywiki/custom:/mediawiki/custom
+
+mywiki-db:
+  image: mariadb:10.1
+  container_name: mywiki-db
+  volumes:
+    - /mnt/mywiki/db:/var/lib/mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=supersecret
+    - MYSQL_DATABASE=mywiki
+    - MYSQL_USER=mywiki
+    - MYSQL_PASSWORD=supersecret
+
+mywiki-parsoid:
+  image: wonderfall/parsoid
+  container_name: mywiki-parsoid
+  environment:
+     - UID=1669
+     - GID=1669
+     - ADDRESS=https://wiki.domain.com/
+     - DOMAIN=mywiki-parsoid
+```
diff --git a/unmaintained/mediawiki/rootfs/nginx/sites-enabled/nginx.conf b/unmaintained/mediawiki/rootfs/nginx/sites-enabled/nginx.conf
new file mode 100644
index 00000000..7db4b77f
--- /dev/null
+++ b/unmaintained/mediawiki/rootfs/nginx/sites-enabled/nginx.conf
@@ -0,0 +1,43 @@
+server {
+        listen 8888;
+        root /mediawiki;
+        index index.php index.html;
+
+        client_body_timeout 60;
+
+        location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+            try_files $uri /index.php;
+            expires max;
+            log_not_found off;
+        }
+
+        location ^~ /cache/ {
+            deny all;
+        }
+
+        location /dumps {
+            root /mediawiki/local;
+        }
+
+        location / {
+            try_files $uri $uri/ @rewrite;
+        }
+
+        location @rewrite {
+            rewrite ^/(.*)$ /index.php;
+        }
+
+        location ^~ /maintenance/ {
+            return 403;
+        }
+
+        location ^~ /images/ {}
+
+	location ~ \.php$ {
+            fastcgi_index index.php;
+            fastcgi_pass unix:/php/run/php-fpm.sock;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /nginx/conf/fastcgi_params;
+            try_files $uri @rewrite;
+	}
+}
diff --git a/unmaintained/mediawiki/rootfs/php/conf.d/apcu.ini b/unmaintained/mediawiki/rootfs/php/conf.d/apcu.ini
new file mode 100644
index 00000000..1bf9b49d
--- /dev/null
+++ b/unmaintained/mediawiki/rootfs/php/conf.d/apcu.ini
@@ -0,0 +1,4 @@
+extension=apcu.so
+apc.enabled=1
+apc.shm_size=<APC_SHM_SIZE>
+apc.ttl=7200
diff --git a/unmaintained/mediawiki/rootfs/usr/local/bin/run.sh b/unmaintained/mediawiki/rootfs/usr/local/bin/run.sh
new file mode 100644
index 00000000..4755696a
--- /dev/null
+++ b/unmaintained/mediawiki/rootfs/usr/local/bin/run.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
+       -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /php/conf.d/apcu.ini
+
+chown -R $UID:$GID /mediawiki /nginx /php /tmp /etc/s6.d
+
+if [ -f /config/LocalSettings.php ] && [ ! -f /mediawiki/LocalSettings.php ]; then
+    ln -s /config/LocalSettings.php /mediawiki/LocalSettings.php
+fi
+
+cp -r /skins/* /mediawiki/skins/
+cp -r /extensions/* /mediawiki/extensions/
+
+exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/unmaintained/parsoid/Dockerfile b/unmaintained/parsoid/Dockerfile
new file mode 100644
index 00000000..4efa7b4c
--- /dev/null
+++ b/unmaintained/parsoid/Dockerfile
@@ -0,0 +1,28 @@
+FROM alpine:3.6
+
+ENV NODE_ENV=production \
+    GID=991 UID=991 \
+    INTERFACE=0.0.0.0 \
+    PORT=8000 \
+    ADDRESS=http://localhost/w/ \
+    DOMAIN=localhost
+
+RUN apk -U --no-cache add \
+    ca-certificates \
+    libressl \
+    nodejs-current \
+    nodejs-current-npm \
+    s6 \
+    git \
+    su-exec \
+ && git clone https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid --depth=1 \
+ && cd parsoid && npm install
+
+COPY rootfs /
+
+RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+EXPOSE 8000
+
+ENTRYPOINT ["run.sh"]
+CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/unmaintained/parsoid/README.md b/unmaintained/parsoid/README.md
new file mode 100644
index 00000000..930b942d
--- /dev/null
+++ b/unmaintained/parsoid/README.md
@@ -0,0 +1,28 @@
+## wonderfall/parsoid
+
+#### What is this? What features?
+- A **simple** Parsoid image.
+- Based on Alpine Linux so it's lightweight!
+- Bundled with latest node.js available (version check is disabled).
+
+#### Build-time variables
+- **VERSION** : version of Ghost.
+
+#### Environment variables
+- **GID** : ghost user id *(default : 991)*
+- **UID** : ghost group id *(default : 991)*
+- **ADDRESS** : your address *(default : http://localhost/w/)*
+- **DOMAIN** : name of the container *(default : localhost)*
+
+### docker-compose.yml sample
+
+```
+mywiki-parsoid:
+  image: wonderfall/parsoid
+  container_name: mywiki-parsoid
+  environment:
+     - UID=1669
+     - GID=1669
+     - ADDRESS=https://wiki.domain.com/
+     - DOMAIN=mywiki-parsoid
+```
diff --git a/unmaintained/parsoid/rootfs/etc/s6.d/.s6-svscan/finish b/unmaintained/parsoid/rootfs/etc/s6.d/.s6-svscan/finish
new file mode 100644
index 00000000..039e4d00
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/etc/s6.d/.s6-svscan/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/unmaintained/parsoid/rootfs/etc/s6.d/parsoid/run b/unmaintained/parsoid/rootfs/etc/s6.d/parsoid/run
new file mode 100644
index 00000000..edf729d7
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/etc/s6.d/parsoid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /parsoid
+exec node bin/server.js
diff --git a/unmaintained/parsoid/rootfs/usr/local/bin/run.sh b/unmaintained/parsoid/rootfs/usr/local/bin/run.sh
new file mode 100644
index 00000000..88069718
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/usr/local/bin/run.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+echo
+echo ">>> wonderfall/parsoid container <<<"
+echo
+
+cd /parsoid
+cp config.example.yaml config.yaml
+sed -i "s|http://localhost/w/|$ADDRESS|g" config.yaml
+sed -i "s|domain: 'localhost'|domain: '$DOMAIN'|g" config.yaml
+
+echo "> Updating permissions..."
+chown -R ${UID}:${GID} /parsoid /etc/s6.d
+
+echo "> Executing process..."
+if [ '$@' == '' ]; then
+    exec su-exec ${UID}:${GID} /bin/s6-svscan /etc/s6.d
+else
+    exec su-exec ${UID}:${GID} "$@"
+fi
diff --git a/unmaintained/parsoid/rootfs/usr/local/etc/disqus.conf b/unmaintained/parsoid/rootfs/usr/local/etc/disqus.conf
new file mode 100644
index 00000000..9b205328
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/usr/local/etc/disqus.conf
@@ -0,0 +1,16 @@
+
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    var disqus_shortname = '<SHORTNAME>';
+    var disqus_identifier = '{{post.id}}';
+ 
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+
diff --git a/unmaintained/parsoid/rootfs/usr/local/etc/ghost.example.conf b/unmaintained/parsoid/rootfs/usr/local/etc/ghost.example.conf
new file mode 100644
index 00000000..2b010240
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/usr/local/etc/ghost.example.conf
@@ -0,0 +1,21 @@
+{
+  "url": "https://my-ghost-blog.com",
+
+  "server": {
+    "host": "0.0.0.0",
+    "port": "2368"
+  },
+
+  "database": {
+    "client": "sqlite3",
+    "connection": {
+      "filename": "content/data/ghost-dev.db"
+    },
+    "useNullAsDefault": true,
+    "debug": false
+  },
+
+  "mail": {
+    "transport": "Direct"
+  }
+}
diff --git a/unmaintained/parsoid/rootfs/usr/local/etc/isso.conf b/unmaintained/parsoid/rootfs/usr/local/etc/isso.conf
new file mode 100644
index 00000000..4287ebcd
--- /dev/null
+++ b/unmaintained/parsoid/rootfs/usr/local/etc/isso.conf
@@ -0,0 +1,7 @@
+</footer>
+<script data-isso="//<HOST>/"
+        data-isso-avatar="<AVATAR>"
+        data-isso-vote="<VOTE>"
+        src="//<HOST>/js/embed.min.js"></script>
+
+<section id="isso-thread"></section>
diff --git a/unmaintained/pgbouncer/Dockerfile b/unmaintained/pgbouncer/Dockerfile
new file mode 100644
index 00000000..ee045976
--- /dev/null
+++ b/unmaintained/pgbouncer/Dockerfile
@@ -0,0 +1,16 @@
+FROM alpine:3.6
+
+ENV UID=991 GID=991
+
+RUN apk -U --no-cache add \
+    pgbouncer \
+    tini \
+    su-exec
+
+COPY run.sh /usr/local/bin/run.sh
+
+RUN chmod +x /usr/local/bin/run.sh
+
+VOLUME /etc/pgbouncer
+
+CMD ["run.sh"]
diff --git a/unmaintained/pgbouncer/README.md b/unmaintained/pgbouncer/README.md
new file mode 100644
index 00000000..76e3be09
--- /dev/null
+++ b/unmaintained/pgbouncer/README.md
@@ -0,0 +1,10 @@
+## wonderfall/pgbouncer
+
+Minimal image for [PgBouncer](https://pgbouncer.github.io/).
+
+### Volumes
+- /etc/pgbouncer
+
+### Environment variables
+- **GID** : user id *(default : 991)*
+- **UID** : group id *(default : 991)*
diff --git a/unmaintained/pgbouncer/run.sh b/unmaintained/pgbouncer/run.sh
new file mode 100644
index 00000000..86eaa2d8
--- /dev/null
+++ b/unmaintained/pgbouncer/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+mkdir /run/pgbouncer
+chown -R $UID:$GID /etc/pgbouncer /var/log/pgbouncer /run/pgbouncer
+exec su-exec $UID:$GID /sbin/tini -- pgbouncer /etc/pgbouncer/pgbouncer.ini

From 62d689c54b579c435ad5a793176611153569ccf6 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 4 Dec 2017 14:55:46 +0100
Subject: [PATCH 019/328] UNMAINTENED

---
 cowrie/Dockerfile                             | 77 -----------------
 cowrie/README.md                              | 60 -------------
 cowrie/run.sh                                 | 12 ---
 freshrss/Dockerfile                           | 30 -------
 freshrss/README.md                            | 24 ------
 freshrss/rootfs/etc/s6.d/cron/run             |  6 --
 .../rootfs/nginx/sites-enabled/nginx.conf     | 33 --------
 freshrss/rootfs/usr/local/bin/run.sh          |  8 --
 ghost/Dockerfile                              | 43 ----------
 ghost/README.md                               | 44 ----------
 ghost/rootfs/etc/s6.d/.s6-svscan/finish       |  2 -
 ghost/rootfs/etc/s6.d/ghost/run               |  5 --
 ghost/rootfs/usr/local/bin/run.sh             | 47 -----------
 ghost/rootfs/usr/local/etc/disqus.conf        | 16 ----
 ghost/rootfs/usr/local/etc/ghost.example.conf | 21 -----
 ghost/rootfs/usr/local/etc/isso.conf          |  7 --
 kippo-graph/Dockerfile                        | 47 -----------
 kippo-graph/README.md                         | 29 -------
 kippo-graph/nginx.conf                        | 84 -------------------
 kippo-graph/php-fpm.conf                      | 11 ---
 kippo-graph/run.sh                            |  3 -
 kippo-graph/s6.d/.s6-svscan/finish            |  3 -
 kippo-graph/s6.d/nginx/run                    |  2 -
 kippo-graph/s6.d/php/run                      |  2 -
 mediawiki/Dockerfile                          | 38 ---------
 mediawiki/README.md                           | 69 ---------------
 .../rootfs/nginx/sites-enabled/nginx.conf     | 43 ----------
 mediawiki/rootfs/php/conf.d/apcu.ini          |  4 -
 mediawiki/rootfs/usr/local/bin/run.sh         | 15 ----
 parsoid/Dockerfile                            | 28 -------
 parsoid/README.md                             | 28 -------
 parsoid/rootfs/etc/s6.d/.s6-svscan/finish     |  2 -
 parsoid/rootfs/etc/s6.d/parsoid/run           |  3 -
 parsoid/rootfs/usr/local/bin/run.sh           | 19 -----
 parsoid/rootfs/usr/local/etc/disqus.conf      | 16 ----
 .../rootfs/usr/local/etc/ghost.example.conf   | 21 -----
 parsoid/rootfs/usr/local/etc/isso.conf        |  7 --
 pgbouncer/Dockerfile                          | 16 ----
 pgbouncer/README.md                           | 10 ---
 pgbouncer/run.sh                              |  4 -
 40 files changed, 939 deletions(-)
 delete mode 100644 cowrie/Dockerfile
 delete mode 100644 cowrie/README.md
 delete mode 100644 cowrie/run.sh
 delete mode 100644 freshrss/Dockerfile
 delete mode 100644 freshrss/README.md
 delete mode 100644 freshrss/rootfs/etc/s6.d/cron/run
 delete mode 100644 freshrss/rootfs/nginx/sites-enabled/nginx.conf
 delete mode 100644 freshrss/rootfs/usr/local/bin/run.sh
 delete mode 100644 ghost/Dockerfile
 delete mode 100644 ghost/README.md
 delete mode 100644 ghost/rootfs/etc/s6.d/.s6-svscan/finish
 delete mode 100644 ghost/rootfs/etc/s6.d/ghost/run
 delete mode 100644 ghost/rootfs/usr/local/bin/run.sh
 delete mode 100644 ghost/rootfs/usr/local/etc/disqus.conf
 delete mode 100644 ghost/rootfs/usr/local/etc/ghost.example.conf
 delete mode 100644 ghost/rootfs/usr/local/etc/isso.conf
 delete mode 100644 kippo-graph/Dockerfile
 delete mode 100644 kippo-graph/README.md
 delete mode 100644 kippo-graph/nginx.conf
 delete mode 100644 kippo-graph/php-fpm.conf
 delete mode 100644 kippo-graph/run.sh
 delete mode 100644 kippo-graph/s6.d/.s6-svscan/finish
 delete mode 100644 kippo-graph/s6.d/nginx/run
 delete mode 100644 kippo-graph/s6.d/php/run
 delete mode 100644 mediawiki/Dockerfile
 delete mode 100644 mediawiki/README.md
 delete mode 100644 mediawiki/rootfs/nginx/sites-enabled/nginx.conf
 delete mode 100644 mediawiki/rootfs/php/conf.d/apcu.ini
 delete mode 100644 mediawiki/rootfs/usr/local/bin/run.sh
 delete mode 100644 parsoid/Dockerfile
 delete mode 100644 parsoid/README.md
 delete mode 100644 parsoid/rootfs/etc/s6.d/.s6-svscan/finish
 delete mode 100644 parsoid/rootfs/etc/s6.d/parsoid/run
 delete mode 100644 parsoid/rootfs/usr/local/bin/run.sh
 delete mode 100644 parsoid/rootfs/usr/local/etc/disqus.conf
 delete mode 100644 parsoid/rootfs/usr/local/etc/ghost.example.conf
 delete mode 100644 parsoid/rootfs/usr/local/etc/isso.conf
 delete mode 100644 pgbouncer/Dockerfile
 delete mode 100644 pgbouncer/README.md
 delete mode 100644 pgbouncer/run.sh

diff --git a/cowrie/Dockerfile b/cowrie/Dockerfile
deleted file mode 100644
index 16964ee5..00000000
--- a/cowrie/Dockerfile
+++ /dev/null
@@ -1,77 +0,0 @@
-FROM alpine:edge
-
-ARG MPFR_VERSION=3.1.5
-ARG MPC_VERSION=1.0.3
-
-ARG GPG_MPFR="07F3 DBBE CC1A 3960 5078  094D 980C 1976 98C3 739D"
-ARG GPG_MPC="AD17 A21E F8AE D8F1 CC02  DBD9 F7D5 C9BF 765C 61E3"
-ARG SHA1_MPC="b8be66396c726fdc36ebb0f692ed8a8cca3bcc66"
-
-ENV UID=991 GID=991
-
-RUN BUILD_DEPS=" \
-    build-base \
-    libtool \
-    libffi-dev \
-    libressl-dev \
-    python-dev \
-    gmp-dev \
-    mariadb-dev \
-    py2-pip \
-    tar \
-    gnupg" \
- && apk -U upgrade && apk add \
-    ${BUILD_DEPS} \
-    libffi \
-    gmp \
-    libressl \
-    python \
-    py-setuptools \
-    openssh-client \
-    mariadb-client-libs \
-    tini \
-    su-exec \
- && cd /tmp && wget -q http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.gz \
- && echo "Verifying authenticity of mpfr-${MPFR_VERSION}.tar.gz..." \
- && wget -q http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.gz.asc \
- && gpg --recv-keys 98C3739D \
- && FINGERPRINT="$(LANG=C gpg --verify mpfr-${MPFR_VERSION}.tar.gz.asc mpfr-${MPFR_VERSION}.tar.gz 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_MPFR}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
- && echo "All seems good, now unpacking mpfr-${MPFR_VERSION}.tar.gz..." \
- && tar xzf mpfr-${MPFR_VERSION}.tar.gz && cd mpfr-${MPFR_VERSION} \
- && ./configure && make && make install \
- && cd /tmp && wget -q ftp://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz \
- && echo "Verifying both integrity and authenticity of mpc-${MPC_VERSION}.tar.gz..." \
- && CHECKSUM=$(sha1sum mpc-${MPC_VERSION}.tar.gz | awk '{print $1}') \
- && if [ "${CHECKSUM}" != "${SHA1_MPC}" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \
- && wget -q ftp://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz.sig \
- && gpg --recv-keys 0xF7D5C9BF765C61E3 \
- && FINGERPRINT="$(LANG=C gpg --verify mpc-${MPC_VERSION}.tar.gz.sig mpc-${MPC_VERSION}.tar.gz 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_MPC}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
- && echo "All seems good, now unpacking mpc-${MPC_VERSION}.tar.gz..." \
- && tar xzf mpc-${MPC_VERSION}.tar.gz && cd mpc-${MPC_VERSION} \
- && ./configure --with-mpfr-lib=/usr/local/lib --with-mpfr-include=/usr/local/include \
- && make && make install \
- && mkdir /cowrie && cd /cowrie \
- && wget -qO- https://github.com/micheloosterhof/cowrie/archive/master.tar.gz | tar xz --strip 1 \
- && pip install --no-cache -r requirements.txt \
- && pip install --no-cache mysql-python \
- && mv cowrie.cfg.dist cowrie.cfg \
- && apk del ${BUILD_DEPS} \
- && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
-
-COPY run.sh /usr/local/bin/run.sh
-
-RUN chmod +x /usr/local/bin/run.sh
-
-VOLUME /cowrie/log /cowrie/dl /custom
-
-EXPOSE 2222
-
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
-
-CMD ["run.sh"]
diff --git a/cowrie/README.md b/cowrie/README.md
deleted file mode 100644
index b6253028..00000000
--- a/cowrie/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-### wonderfall/cowrie
-
-#### What is this?
-Cowrie is a medium interaction SSH honeypot designed to log brute force attacks and the shell interaction performed by the attacker. Cowrie is based on Kippo.
-
-#### Build-time variables
-- **MPFR_VERSION** : GNU MPFR version.
-- **MPC_VERSION** : GNU MPC version.
-- **GPG_** : fingerprints of signing keys.
-- **SHA_** : fingerprints of tarballs
-
-#### Environment variables
-- **UID** *(default : 991)*
-- **GID** *(default : 991)*
-
-#### How to configure
-You should provide your own configuration file from this base : https://raw.githubusercontent.com/micheloosterhof/cowrie/master/cowrie.cfg.dist
-You can mount this single file to your Docker container.
-
-#### Volumes
-- **/cowrie/dl** : where downloads are stored.
-- **/cowrie/log** : cowrie and tty sessions logs.
-- **/cowrie/cowrie.cfg** : cowrie configuration file. **Provide yours!**
-- **/custom** : customize cowrie structure with your own files
-
-#### Docker compose (example)
-```
-cowrie:
-  image: wonderfall/cowrie
-  links:                           ### MySQL output
-    - cowrie-db:cowrie-db          ### MySQL output
-  ports:
-    - "2222:2222"
-  volumes:
-    - /mnt/cowrie/dl:/cowrie/dl
-    - /mnt/cowrie/log:/cowrie/log
-    - /mnt/cowrie/custom:/custom
-    - /mnt/cowrie/cowrie.cfg:/cowrie/cowrie.cfg
-  environment:
-    - GID=1000
-    - UID=1000
-
-### MySQL output
-# First, you'll have to initialise tables with a .sql file
-# mkdir -p /mnt/cowrie/sql
-# wget https://raw.githubusercontent.com/micheloosterhof/cowrie/master/doc/sql/mysql.sql -P /mnt/cowrie/sql/cowrie.sql
-# It needs also to be configured in the cowrie.cfg file
-
-cowrie-db:
-  image: mariadb:10
-  volumes:
-    - /mnt/cowrie/db:/var/lib/mysql
-    - /mnt/cowrie/sql:/docker-entrypoint-initdb.d
-  environment:
-    - MYSQL_ROOT_PASSWORD=supersecretpassword
-    - MYSQL_DATABASE=cowrie
-    - MYSQL_USER=cowrie
-    - MYSQL_PASSWORD=supersecretpassword
-```
-
diff --git a/cowrie/run.sh b/cowrie/run.sh
deleted file mode 100644
index e4321e0b..00000000
--- a/cowrie/run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-cd /cowrie
-
-rm twistd.pid &>/dev/null
-mkdir -p /cowrie/log/tty &>/dev/null
-cp -R /custom/* /cowrie &>/dev/null
-chown -R $UID:$GID /cowrie
-
-COWRIEDIR=$(dirname $0)
-export PYTHONPATH=${PYTHONPATH}:${COWRIEDIR}
-
-exec su-exec $UID:$GID /sbin/tini -- twistd -n -l /cowrie/log/cowrie.log cowrie
diff --git a/freshrss/Dockerfile b/freshrss/Dockerfile
deleted file mode 100644
index 75e2d5fb..00000000
--- a/freshrss/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM wonderfall/nginx-php:7.1
-
-ARG FRESHRSS_VER=1.8.0
-
-ENV UID=991 GID=991 \
-    UPLOAD_MAX_SIZE=10M \
-    MEMORY_LIMIT=128M \
-    CRON_PERIOD=30m
-
-RUN apk -U add --no-cache \
-    tar \
-    libressl \
-    ca-certificates \
- && mkdir freshrss && cd freshrss \
- && wget -qO- https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VER}.tar.gz | tar xz --strip 1 \
- && mv data data_tmp
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /freshrss/data /php/session
-
-EXPOSE 8888
-
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
-      description="A free, self-hostable aggregator" \
-      version="FreshRSS ${FRESHRSS_VER}"
-
-CMD ["run.sh"]
diff --git a/freshrss/README.md b/freshrss/README.md
deleted file mode 100644
index 82bdf7f7..00000000
--- a/freshrss/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## wonderfall/freshrss
-
-A free, self-hostable aggregator : https://github.com/FreshRSS/FreshRSS
-
-#### Features
-- Based on Alpine Linux (wonderfall/nginx-php image)
-- Bundled with nginx and PHP7.1.
-- Automatic feed update (frequency at 30 minutes by default)
-
-#### Build-time variables
-- **FRESHRSS_VER** : version of FreshRSS
-
-#### Environment variables
-- **UID** : user id
-- **GID** : group id
-- **MEMORY_LIMIT** : php memory limit *(default : 128M)*
-- **UPLOAD_MAX_SIZE** : maximum upload size *(default : 10M)*
-- **CRON_PERIOD** : feed update frequency *(default : 30m)*
-
-#### Volumes
-- **/freshrss/data**
-
-#### Ports
-- **8888** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
diff --git a/freshrss/rootfs/etc/s6.d/cron/run b/freshrss/rootfs/etc/s6.d/cron/run
deleted file mode 100644
index 584e453f..00000000
--- a/freshrss/rootfs/etc/s6.d/cron/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-while true; do
-  php -f /freshrss/app/actualize_script.php
-  sleep <CRON_PERIOD>
-done
diff --git a/freshrss/rootfs/nginx/sites-enabled/nginx.conf b/freshrss/rootfs/nginx/sites-enabled/nginx.conf
deleted file mode 100644
index 69977bc9..00000000
--- a/freshrss/rootfs/nginx/sites-enabled/nginx.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-server {
-        listen 8888;
-        root /freshrss;
-        index index.php index.html;
-
-        location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
-            expires 30d;
-            access_log off;
-	}
-
-        location ~ ^/(data|cfg|tmp) {                                        
-            deny all;                                                        
-        }                                                                    
-                                                                             
-        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {  
-            deny all;                                                        
-        } 
-    
-        location ~ /\. {
-            deny all;
-        }
-
-        location / {
-	    try_files $uri $uri/ /index.php;
-        }
-
-	location ~ \.php$ {
-            fastcgi_index index.php;
-            fastcgi_pass unix:/php/run/php-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include /nginx/conf/fastcgi_params;
-	}
-}
diff --git a/freshrss/rootfs/usr/local/bin/run.sh b/freshrss/rootfs/usr/local/bin/run.sh
deleted file mode 100644
index e61bfaa7..00000000
--- a/freshrss/rootfs/usr/local/bin/run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
-       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
-       -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
-
-[ ! "$(ls -A /freshrss/data)" ] && cp -R /freshrss/data_tmp/* /freshrss/data/
-chown -R $UID:$GID /freshrss /nginx /php /tmp /etc/s6.d
-exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/ghost/Dockerfile b/ghost/Dockerfile
deleted file mode 100644
index 84bd2c73..00000000
--- a/ghost/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM alpine:3.6
-
-ARG VERSION=1.14.0
-
-ENV GHOST_NODE_VERSION_CHECK=false \
-    NODE_ENV=production \
-    GID=991 UID=991 \
-    ADDRESS=https://my-ghost-blog.com \
-    ENABLE_ISSO=False \
-    ISSO_HOST=isso.domain.tld \
-    ISSO_AVATAR=false \
-    ISSO_VOTE=false
-
-WORKDIR /ghost
-
-RUN apk -U --no-cache add \
-    bash \
-    ca-certificates \
-    grep \
-    libressl \
-    nodejs-current \
-    nodejs-current-npm \
-    s6 \
-    su-exec \
-    vim \
- && wget -q https://github.com/TryGhost/Ghost/releases/download/${VERSION}/Ghost-${VERSION}.zip -P /tmp \
- && unzip -q /tmp/Ghost-${VERSION}.zip -d /ghost \
- && npm install --production \
- && mv content/themes/casper casper
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-EXPOSE 2368
-
-VOLUME /ghost/content
-
-LABEL description="Ghost CMS ${VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
-
-ENTRYPOINT ["run.sh"]
-CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/ghost/README.md b/ghost/README.md
deleted file mode 100644
index 1ed3d58e..00000000
--- a/ghost/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-## wonderfall/ghost
-
-![](https://i.goopics.net/lt.png)
-
-**Breaking changes if you're upgrading from 0.x. Please export your current data, and import them again in a new 1.x blog. You also have to move your images to the new volume if you want to keep them. Disqus is also not supported, please move to Isso, a much better comments system. Sorry for the mess!**
-
-#### What is this? What features?
-- A **simple** Ghost CMS build made for production.
-- Based on Alpine Linux so it's lightweight!
-- Bundled with latest node.js available (version check is disabled).
-- Offers Isso integration.
-
-#### Build-time variables
-- **VERSION** : version of Ghost.
-
-#### Environment variables
-- **GID** : ghost user id *(default : 991)*
-- **UID** : ghost group id *(default : 991)*
-- **ADDRESS** : your domain (with *http(s)://*) *(default : https://my-ghost-blog.com)*
-- **ENABLE_ISSO** : enables Isso support if set to *True* *(default : False)*
-- **ISSO_HOST**, **ISSO_AVATAR**, **ISSO_VOTE** : Isso settings (*True* or *False*)
-
-#### Volumes
-- **/ghost/content** : contents of your blog
-
-### Ports
-- **2368** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
-
-### How to configure?
-Everything you need is in `/ghost/content/ghost.conf` (also mounted on your host...).
-
-### docker-compose.yml sample
-
-```
-ghost-myblog:
-  image: wonderfall/ghost:1
-  container_name: ghost-myblog
-  environment:
-    - UID=8100
-    - GID=8100
-    - ADDRESS=https://myblog.com
-  volumes:
-    - /mnt/docker/myblog:/ghost/content
-```
diff --git a/ghost/rootfs/etc/s6.d/.s6-svscan/finish b/ghost/rootfs/etc/s6.d/.s6-svscan/finish
deleted file mode 100644
index 039e4d00..00000000
--- a/ghost/rootfs/etc/s6.d/.s6-svscan/finish
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/ghost/rootfs/etc/s6.d/ghost/run b/ghost/rootfs/etc/s6.d/ghost/run
deleted file mode 100644
index d24cf267..00000000
--- a/ghost/rootfs/etc/s6.d/ghost/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /ghost
-NODE_ENV=development node_modules/.bin/knex-migrator init
-NODE_ENV=development node_modules/.bin/knex-migrator migrate
-exec npm start
diff --git a/ghost/rootfs/usr/local/bin/run.sh b/ghost/rootfs/usr/local/bin/run.sh
deleted file mode 100644
index a6d86ea4..00000000
--- a/ghost/rootfs/usr/local/bin/run.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-echo
-echo ">>> wonderfall/ghost container <<<"
-echo
-
-echo "> Initializing content folder..."
-cd content
-mkdir apps data images themes logs adapters &>/dev/null
-rm -rf /ghost/content/themes/casper &>/dev/null
-cp -r /ghost/casper themes/casper &>/dev/null
-cd /ghost
-
-if [ ! -f /ghost/content/ghost.conf ]; then
-  echo
-  echo "INFO : No configuration file was provided, an example will be used"
-  echo "       You can access and modify it in the volume you mounted"
-  echo "       Restart in order to apply your changes!"
-  echo
-  mv /usr/local/etc/ghost.example.conf /ghost/content/ghost.conf
-fi
-
-if [ ! -f /ghost/config.production.json ]; then
-  ln -s content/ghost.conf config.production.json
-fi
-
-echo "> Applying preferences..."
-
-sed -i -e "s|https://my-ghost-blog.com|${ADDRESS}|g" /ghost/content/ghost.conf
-
-if [ "$ENABLE_ISSO" == "True" ] && ! grep -q 'isso' /ghost/content/themes/casper/post.hbs; then
-    cd /usr/local/etc
-    sed -i -e "/\/author/r isso.conf" /ghost/content/themes/casper/post.hbs
-    sed -i -e '/isso-thread/{n;d}' /ghost/content/themes/casper/post.hbs
-    sed -i -e "s/<HOST>/$ISSO_HOST/g" \
-           -e "s/<AVATAR>/$ISSO_AVATAR/g" \
-           -e "s/<VOTE>/$ISSO_VOTE/g" /ghost/content/themes/casper/post.hbs
-fi
-
-echo "> Updating permissions..."
-chown -R ${UID}:${GID} /ghost /etc/s6.d
-
-echo "> Executing process..."
-if [ '$@' == '' ]; then
-    exec su-exec ${UID}:${GID} /bin/s6-svscan /etc/s6.d
-else
-    exec su-exec ${UID}:${GID} "$@"
-fi
diff --git a/ghost/rootfs/usr/local/etc/disqus.conf b/ghost/rootfs/usr/local/etc/disqus.conf
deleted file mode 100644
index 9b205328..00000000
--- a/ghost/rootfs/usr/local/etc/disqus.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-    var disqus_shortname = '<SHORTNAME>';
-    var disqus_identifier = '{{post.id}}';
- 
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-
diff --git a/ghost/rootfs/usr/local/etc/ghost.example.conf b/ghost/rootfs/usr/local/etc/ghost.example.conf
deleted file mode 100644
index 2b010240..00000000
--- a/ghost/rootfs/usr/local/etc/ghost.example.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "url": "https://my-ghost-blog.com",
-
-  "server": {
-    "host": "0.0.0.0",
-    "port": "2368"
-  },
-
-  "database": {
-    "client": "sqlite3",
-    "connection": {
-      "filename": "content/data/ghost-dev.db"
-    },
-    "useNullAsDefault": true,
-    "debug": false
-  },
-
-  "mail": {
-    "transport": "Direct"
-  }
-}
diff --git a/ghost/rootfs/usr/local/etc/isso.conf b/ghost/rootfs/usr/local/etc/isso.conf
deleted file mode 100644
index 4287ebcd..00000000
--- a/ghost/rootfs/usr/local/etc/isso.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-</footer>
-<script data-isso="//<HOST>/"
-        data-isso-avatar="<AVATAR>"
-        data-isso-vote="<VOTE>"
-        src="//<HOST>/js/embed.min.js"></script>
-
-<section id="isso-thread"></section>
diff --git a/kippo-graph/Dockerfile b/kippo-graph/Dockerfile
deleted file mode 100644
index 70443d0a..00000000
--- a/kippo-graph/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM alpine:edge
-
-ENV GID=991 UID=991
-
-RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && BUILD_DEPS="tar libressl ca-certificates" \
- && apk -U upgrade && apk add \
-    $BUILD_DEPS \
-    nginx \
-    s6 \
-    su-exec \
-    coreutils \
-    bind-tools \
-    php7-fpm@testing \
-    php7-mysqlnd@testing \
-    php7-pdo@testing \
-    php7-pdo_mysql@testing \
-    php7-openssl@testing \
-    php7-gd@testing \
-    php7-curl@testing \
-    php7-phar@testing \
-    php7-dom@testing \
- && mkdir kippo-graph && cd kippo-graph \
- && wget -qO- https://github.com/ikoniaris/kippo-graph/archive/master.tar.gz | tar xz --strip 1 \
- && chmod 777 generated-graphs \
- && mv config.php.dist config.php \
- && rm /kippo-graph/include/maxmind/GeoLite2-City.mmdb /kippo-graph/include/maxmind/geoip2.phar \
- && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz -P /kippo-graph/include/maxmind \
- && gzip -d /kippo-graph/include/maxmind/GeoLite2-City.mmdb.gz \
- && wget -q https://github.com/maxmind/GeoIP2-php/releases/download/v2.4.5/geoip2.phar -P /kippo-graph/include/maxmind \
- && apk del $BUILD_DEPS \
- && rm -f /var/cache/apk/*
-
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
-COPY run.sh /usr/local/bin/run.sh
-COPY s6.d /etc/s6.d
-
-RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /kippo-graph/generated-graphs
-
-EXPOSE 8888
-
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
-
-CMD ["run.sh"]
diff --git a/kippo-graph/README.md b/kippo-graph/README.md
deleted file mode 100644
index 2689b465..00000000
--- a/kippo-graph/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-### wonderfall/kippo-graph
-
-![kippo-graph](https://github.com/ikoniaris/kippo-graph/blob/master/images/kippo-graph-img.png)
-
-#### What is this?
-Kippo-Graph is a full featured script to visualize statistics for a Kippo based SSH honeypot.
-
-#### Environment variables
-- **UID** *(default : 991)*
-- **GID** *(default : 991)*
-
-#### How to configure
-You should provide your own configuration file from this base : https://github.com/ikoniaris/kippo-graph/blob/master/config.php.dist
-You can mount this single file to your Docker container.
-
-#### Docker compose (example)
-```
-kippo-graph:
-  image: wonderfall/kippo-graph
-  links:
-    - cowrie-db:cowrie-db
-  volumes:
-    - /mnt/kippo-graph/config.php:/kippo-graph/config.php
-    - /mnt/cowrie/log:/opt/cowrie/log
-  environment:
-    - GID=991
-    - UID=991
-```
-
diff --git a/kippo-graph/nginx.conf b/kippo-graph/nginx.conf
deleted file mode 100644
index 100f66ab..00000000
--- a/kippo-graph/nginx.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-worker_processes auto;
-pid /tmp/nginx.pid;
-daemon off;
-
-events {
-    worker_connections 1024; 
-    use epoll;
-}
-
-http {
-    include /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    access_log off;
-    error_log /tmp/ngx_error.log error;
-    
-    sendfile on;
-    keepalive_timeout 15;
-    keepalive_disable msie6;
-    keepalive_requests 100;
-    tcp_nopush on;
-    tcp_nodelay on;
-    server_tokens off;
-
-    fastcgi_temp_path /tmp/fastcgi 1 2;
-    client_body_temp_path /tmp/client_body 1 2;
-    proxy_temp_path /tmp/proxy 1 2;
-    uwsgi_temp_path /tmp/uwsgi 1 2;
-    scgi_temp_path /tmp/scgi 1 2;
-    
-    gzip on;
-    gzip_comp_level 5;
-    gzip_min_length 512;
-    gzip_buffers 4 8k;
-    gzip_proxied any;
-    gzip_vary on;
-    gzip_disable "msie6";
-    gzip_types
-        text/css
-        text/javascript
-        text/xml
-        text/plain
-        text/x-component
-        application/javascript
-        application/x-javascript
-        application/json
-        application/xml
-        application/rss+xml
-        application/vnd.ms-fontobject
-        font/truetype
-        font/opentype
-        image/svg+xml;
-
-    server {
-    	listen 8888;
-    	root /kippo-graph;
-    	index index.php index.html;
-
-        location ~ ^/(data|cfg|tmp) {                                        
-            deny all;                                                        
-        }                                                                    
-                                                                             
-        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {  
-            deny all;                                                        
-        } 
-    
-        location ~ /\. {
-            deny all;
-        }
-
-    	location / {
-        	try_files $uri $uri/ /index.php;
-    	}
-
-	location ~ \.php$ {
-    		fastcgi_index index.php;
-    		fastcgi_pass unix:/tmp/php-fpm.sock;
-    		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    		include /etc/nginx/fastcgi_params;
-	}
-
-    }
-
-}
diff --git a/kippo-graph/php-fpm.conf b/kippo-graph/php-fpm.conf
deleted file mode 100644
index f636044d..00000000
--- a/kippo-graph/php-fpm.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[global]
-daemonize = no
-
-[www]
-listen = /tmp/php-fpm.sock
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-chdir = /
diff --git a/kippo-graph/run.sh b/kippo-graph/run.sh
deleted file mode 100644
index 97e5f9a8..00000000
--- a/kippo-graph/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-chown -R $UID:$GID /kippo-graph /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
-exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/kippo-graph/s6.d/.s6-svscan/finish b/kippo-graph/s6.d/.s6-svscan/finish
deleted file mode 100644
index c52d3c26..00000000
--- a/kippo-graph/s6.d/.s6-svscan/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
diff --git a/kippo-graph/s6.d/nginx/run b/kippo-graph/s6.d/nginx/run
deleted file mode 100644
index eaf80495..00000000
--- a/kippo-graph/s6.d/nginx/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec nginx
diff --git a/kippo-graph/s6.d/php/run b/kippo-graph/s6.d/php/run
deleted file mode 100644
index e238021f..00000000
--- a/kippo-graph/s6.d/php/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec php-fpm7
diff --git a/mediawiki/Dockerfile b/mediawiki/Dockerfile
deleted file mode 100644
index b563e160..00000000
--- a/mediawiki/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM wonderfall/nginx-php:7.1
-
-ARG MEDIAWIKI_VER=1.29
-ARG SUB_VERSION=1
-
-ENV UID=991 GID=991 \
-    UPLOAD_MAX_SIZE=10M \
-    MEMORY_LIMIT=128M
-
-RUN apk -U add \
-    tar \
-    libressl \
-    ca-certificates \
-    git \
-    lua \
-    coreutils \
-    diffutils \
-    build-base \
-    autoconf \
- && pecl install apcu \
- && mkdir mediawiki && cd mediawiki \
- && wget -qO- https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_VER}/mediawiki-${MEDIAWIKI_VER}.${SUB_VERSION}.tar.gz | tar xz --strip 1 \
- && apk del build-base autoconf \
- && rm -rf /var/cache/apk/*
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /config /skins /extensions /mediawiki/images /php/session
-
-EXPOSE 8888
-
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
-      description="MediaWiki is a free software open source wiki package written in PHP" \
-      version="MediaWiki ${MEDIAWIKI_VER}.${SUB_VERSION}"
-
-CMD ["run.sh"]
diff --git a/mediawiki/README.md b/mediawiki/README.md
deleted file mode 100644
index c6b64cd3..00000000
--- a/mediawiki/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-## wonderfall/mediawiki
-
-Host your own Wiki!
-
-#### Features
-- Based on Alpine Linux (wonderfall/nginx-php image)
-- Bundled with nginx and PHP7.1.
-
-#### Build-time variables
-- **MEDIAWIKI_VER** : Mediawiki version
-- **SUB_VERSION** : Mediawiki subversion
-
-#### Environment variables
-- **UID** : privatebin user id
-- **GID** : privatebin group id
-- **MEMORY_LIMIT** : php memorny limit *(default : 128M)*
-- **UPLOAD_MAX_SIZE** : maximum upload size *(default : 10M)*
-
-#### Volumes
-- /mediawiki/images
-- /extensions
-- /skins
-- /config
-- /mediawiki/custom
-
-#### Ports
-- **8888** [(reverse proxy!)](https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration)
-
-#### docker-compose.yml sample
-
-```
-mywiki:
-  image: wonderfall/mediawiki
-  container_name: mywiki
-  links:
-    - mywiki-db:mywiki-db
-    - mywiki-parsoid:mywiki-parsoid
-  environment:
-    - UPLOAD_MAX_SIZE=20M
-    - MEMORY_LIMIT=512M
-    - UID=1668
-    - GID=1668
-  volumes:
-    - /mnt/mywiki/images:/mediawiki/images
-    - /mnt/mywiki/extensions:/extensions
-    - /mnt/mywiki/skins:/skins
-    - /mnt/mywiki/config:/config
-    - /mnt/mywiki/custom:/mediawiki/custom
-
-mywiki-db:
-  image: mariadb:10.1
-  container_name: mywiki-db
-  volumes:
-    - /mnt/mywiki/db:/var/lib/mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=supersecret
-    - MYSQL_DATABASE=mywiki
-    - MYSQL_USER=mywiki
-    - MYSQL_PASSWORD=supersecret
-
-mywiki-parsoid:
-  image: wonderfall/parsoid
-  container_name: mywiki-parsoid
-  environment:
-     - UID=1669
-     - GID=1669
-     - ADDRESS=https://wiki.domain.com/
-     - DOMAIN=mywiki-parsoid
-```
diff --git a/mediawiki/rootfs/nginx/sites-enabled/nginx.conf b/mediawiki/rootfs/nginx/sites-enabled/nginx.conf
deleted file mode 100644
index 7db4b77f..00000000
--- a/mediawiki/rootfs/nginx/sites-enabled/nginx.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-server {
-        listen 8888;
-        root /mediawiki;
-        index index.php index.html;
-
-        client_body_timeout 60;
-
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
-            try_files $uri /index.php;
-            expires max;
-            log_not_found off;
-        }
-
-        location ^~ /cache/ {
-            deny all;
-        }
-
-        location /dumps {
-            root /mediawiki/local;
-        }
-
-        location / {
-            try_files $uri $uri/ @rewrite;
-        }
-
-        location @rewrite {
-            rewrite ^/(.*)$ /index.php;
-        }
-
-        location ^~ /maintenance/ {
-            return 403;
-        }
-
-        location ^~ /images/ {}
-
-	location ~ \.php$ {
-            fastcgi_index index.php;
-            fastcgi_pass unix:/php/run/php-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include /nginx/conf/fastcgi_params;
-            try_files $uri @rewrite;
-	}
-}
diff --git a/mediawiki/rootfs/php/conf.d/apcu.ini b/mediawiki/rootfs/php/conf.d/apcu.ini
deleted file mode 100644
index 1bf9b49d..00000000
--- a/mediawiki/rootfs/php/conf.d/apcu.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-extension=apcu.so
-apc.enabled=1
-apc.shm_size=<APC_SHM_SIZE>
-apc.ttl=7200
diff --git a/mediawiki/rootfs/usr/local/bin/run.sh b/mediawiki/rootfs/usr/local/bin/run.sh
deleted file mode 100644
index 4755696a..00000000
--- a/mediawiki/rootfs/usr/local/bin/run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
-       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
-       -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /php/conf.d/apcu.ini
-
-chown -R $UID:$GID /mediawiki /nginx /php /tmp /etc/s6.d
-
-if [ -f /config/LocalSettings.php ] && [ ! -f /mediawiki/LocalSettings.php ]; then
-    ln -s /config/LocalSettings.php /mediawiki/LocalSettings.php
-fi
-
-cp -r /skins/* /mediawiki/skins/
-cp -r /extensions/* /mediawiki/extensions/
-
-exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/parsoid/Dockerfile b/parsoid/Dockerfile
deleted file mode 100644
index 4efa7b4c..00000000
--- a/parsoid/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM alpine:3.6
-
-ENV NODE_ENV=production \
-    GID=991 UID=991 \
-    INTERFACE=0.0.0.0 \
-    PORT=8000 \
-    ADDRESS=http://localhost/w/ \
-    DOMAIN=localhost
-
-RUN apk -U --no-cache add \
-    ca-certificates \
-    libressl \
-    nodejs-current \
-    nodejs-current-npm \
-    s6 \
-    git \
-    su-exec \
- && git clone https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid --depth=1 \
- && cd parsoid && npm install
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-EXPOSE 8000
-
-ENTRYPOINT ["run.sh"]
-CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/parsoid/README.md b/parsoid/README.md
deleted file mode 100644
index 930b942d..00000000
--- a/parsoid/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## wonderfall/parsoid
-
-#### What is this? What features?
-- A **simple** Parsoid image.
-- Based on Alpine Linux so it's lightweight!
-- Bundled with latest node.js available (version check is disabled).
-
-#### Build-time variables
-- **VERSION** : version of Ghost.
-
-#### Environment variables
-- **GID** : ghost user id *(default : 991)*
-- **UID** : ghost group id *(default : 991)*
-- **ADDRESS** : your address *(default : http://localhost/w/)*
-- **DOMAIN** : name of the container *(default : localhost)*
-
-### docker-compose.yml sample
-
-```
-mywiki-parsoid:
-  image: wonderfall/parsoid
-  container_name: mywiki-parsoid
-  environment:
-     - UID=1669
-     - GID=1669
-     - ADDRESS=https://wiki.domain.com/
-     - DOMAIN=mywiki-parsoid
-```
diff --git a/parsoid/rootfs/etc/s6.d/.s6-svscan/finish b/parsoid/rootfs/etc/s6.d/.s6-svscan/finish
deleted file mode 100644
index 039e4d00..00000000
--- a/parsoid/rootfs/etc/s6.d/.s6-svscan/finish
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/parsoid/rootfs/etc/s6.d/parsoid/run b/parsoid/rootfs/etc/s6.d/parsoid/run
deleted file mode 100644
index edf729d7..00000000
--- a/parsoid/rootfs/etc/s6.d/parsoid/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /parsoid
-exec node bin/server.js
diff --git a/parsoid/rootfs/usr/local/bin/run.sh b/parsoid/rootfs/usr/local/bin/run.sh
deleted file mode 100644
index 88069718..00000000
--- a/parsoid/rootfs/usr/local/bin/run.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-echo
-echo ">>> wonderfall/parsoid container <<<"
-echo
-
-cd /parsoid
-cp config.example.yaml config.yaml
-sed -i "s|http://localhost/w/|$ADDRESS|g" config.yaml
-sed -i "s|domain: 'localhost'|domain: '$DOMAIN'|g" config.yaml
-
-echo "> Updating permissions..."
-chown -R ${UID}:${GID} /parsoid /etc/s6.d
-
-echo "> Executing process..."
-if [ '$@' == '' ]; then
-    exec su-exec ${UID}:${GID} /bin/s6-svscan /etc/s6.d
-else
-    exec su-exec ${UID}:${GID} "$@"
-fi
diff --git a/parsoid/rootfs/usr/local/etc/disqus.conf b/parsoid/rootfs/usr/local/etc/disqus.conf
deleted file mode 100644
index 9b205328..00000000
--- a/parsoid/rootfs/usr/local/etc/disqus.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-    var disqus_shortname = '<SHORTNAME>';
-    var disqus_identifier = '{{post.id}}';
- 
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-
diff --git a/parsoid/rootfs/usr/local/etc/ghost.example.conf b/parsoid/rootfs/usr/local/etc/ghost.example.conf
deleted file mode 100644
index 2b010240..00000000
--- a/parsoid/rootfs/usr/local/etc/ghost.example.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "url": "https://my-ghost-blog.com",
-
-  "server": {
-    "host": "0.0.0.0",
-    "port": "2368"
-  },
-
-  "database": {
-    "client": "sqlite3",
-    "connection": {
-      "filename": "content/data/ghost-dev.db"
-    },
-    "useNullAsDefault": true,
-    "debug": false
-  },
-
-  "mail": {
-    "transport": "Direct"
-  }
-}
diff --git a/parsoid/rootfs/usr/local/etc/isso.conf b/parsoid/rootfs/usr/local/etc/isso.conf
deleted file mode 100644
index 4287ebcd..00000000
--- a/parsoid/rootfs/usr/local/etc/isso.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-</footer>
-<script data-isso="//<HOST>/"
-        data-isso-avatar="<AVATAR>"
-        data-isso-vote="<VOTE>"
-        src="//<HOST>/js/embed.min.js"></script>
-
-<section id="isso-thread"></section>
diff --git a/pgbouncer/Dockerfile b/pgbouncer/Dockerfile
deleted file mode 100644
index ee045976..00000000
--- a/pgbouncer/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM alpine:3.6
-
-ENV UID=991 GID=991
-
-RUN apk -U --no-cache add \
-    pgbouncer \
-    tini \
-    su-exec
-
-COPY run.sh /usr/local/bin/run.sh
-
-RUN chmod +x /usr/local/bin/run.sh
-
-VOLUME /etc/pgbouncer
-
-CMD ["run.sh"]
diff --git a/pgbouncer/README.md b/pgbouncer/README.md
deleted file mode 100644
index 76e3be09..00000000
--- a/pgbouncer/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## wonderfall/pgbouncer
-
-Minimal image for [PgBouncer](https://pgbouncer.github.io/).
-
-### Volumes
-- /etc/pgbouncer
-
-### Environment variables
-- **GID** : user id *(default : 991)*
-- **UID** : group id *(default : 991)*
diff --git a/pgbouncer/run.sh b/pgbouncer/run.sh
deleted file mode 100644
index 86eaa2d8..00000000
--- a/pgbouncer/run.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-mkdir /run/pgbouncer
-chown -R $UID:$GID /etc/pgbouncer /var/log/pgbouncer /run/pgbouncer
-exec su-exec $UID:$GID /sbin/tini -- pgbouncer /etc/pgbouncer/pgbouncer.ini

From 05030bb8f4c123ff3ed6c95bc143f9ddb723f093 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 4 Dec 2017 15:46:41 +0100
Subject: [PATCH 020/328] [nextcloud] update repository reference

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index cd36c22d..a0128ed3 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -1,4 +1,4 @@
-## wonderfall/nextcloud
+## hoellen/nextcloud
 
 
 [![](https://images.microbadger.com/badges/version/wonderfall/nextcloud.svg)](http://microbadger.com/images/wonderfall/nextcloud "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/wonderfall/nextcloud.svg)](http://microbadger.com/images/wonderfall/nextcloud "Get your own image badge on microbadger.com")

From e962ad371fcbf16d78649e3da0910f5ea0f66e0c Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 5 Dec 2017 10:08:42 +0100
Subject: [PATCH 021/328] [searx] update README

---
 searx/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/searx/README.md b/searx/README.md
index 969489c2..59f4e65d 100644
--- a/searx/README.md
+++ b/searx/README.md
@@ -1,13 +1,14 @@
-## wonderfall/searx
+## hoellen/searx
 
 ![](https://i.goopics.net/ls.png)
 
 #### What is searx?
 Searx is a metasearch engine, inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests. Searx can be added to your browser's search bar; moreover, it can be set as the default search engine. 
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests. Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 
 #### Features
 - Based on Alpine Linux.
+- Based on discontinued wonderfall/searx (thanks!).
 - Latest code from [asciimoo/searx](https://github.com/asciimoo/searx)
 - A unique secret key is generated when booting the first time.
 

From 581c0a0c6eaf7b65dff8db07c012dc7cff5cba78 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 5 Dec 2017 10:09:15 +0100
Subject: [PATCH 022/328] [searx] update to 0.13.1

---
 searx/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index aa19333e..163ddf7c 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG VERSION=0.12.0
+ARG VERSION=0.13.1
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991
@@ -36,6 +36,6 @@ RUN chmod +x /usr/local/bin/run.sh
 
 EXPOSE 8888
 
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+LABEL maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]

From b2be52764ad7fa22bffd443930cbe7ec002cda15 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 6 Dec 2017 14:03:08 +0100
Subject: [PATCH 023/328] UNMAINTAINED

---
 {cryptpad => unmaintained/cryptpad}/Dockerfile                    | 0
 {cryptpad => unmaintained/cryptpad}/README.md                     | 0
 {cryptpad => unmaintained/cryptpad}/run.sh                        | 0
 {isso => unmaintained/isso}/Dockerfile                            | 0
 {isso => unmaintained/isso}/README.md                             | 0
 {isso => unmaintained/isso}/run.sh                                | 0
 {reverse => unmaintained/reverse}/Dockerfile                      | 0
 {reverse => unmaintained/reverse}/README.md                       | 0
 {reverse => unmaintained/reverse}/auto_upgrade.sh                 | 0
 {reverse => unmaintained/reverse}/docker-compose.yml              | 0
 .../reverse}/rootfs/etc/s6.d/.s6-svscan/finish                    | 0
 {reverse => unmaintained/reverse}/rootfs/etc/s6.d/check_certs/run | 0
 {reverse => unmaintained/reverse}/rootfs/etc/s6.d/nginx/run       | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ct.conf     | 0
 .../reverse}/rootfs/nginx/conf.d/headers.conf                     | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/hsts.conf   | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ocsp.conf   | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/proxy.conf  | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ssl.conf    | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/conf/nginx.conf    | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/path.d/template    | 0
 .../reverse}/rootfs/nginx/path.d/template_auth                    | 0
 .../reverse}/rootfs/nginx/sites-enabled/template                  | 0
 .../reverse}/rootfs/nginx/sites-enabled/template_ssl              | 0
 {reverse => unmaintained/reverse}/rootfs/nginx/www/letsencrypt    | 0
 .../reverse}/rootfs/usr/local/bin/check_certs                     | 0
 {reverse => unmaintained/reverse}/rootfs/usr/local/bin/startup    | 0
 27 files changed, 0 insertions(+), 0 deletions(-)
 rename {cryptpad => unmaintained/cryptpad}/Dockerfile (100%)
 rename {cryptpad => unmaintained/cryptpad}/README.md (100%)
 rename {cryptpad => unmaintained/cryptpad}/run.sh (100%)
 rename {isso => unmaintained/isso}/Dockerfile (100%)
 rename {isso => unmaintained/isso}/README.md (100%)
 rename {isso => unmaintained/isso}/run.sh (100%)
 rename {reverse => unmaintained/reverse}/Dockerfile (100%)
 rename {reverse => unmaintained/reverse}/README.md (100%)
 rename {reverse => unmaintained/reverse}/auto_upgrade.sh (100%)
 rename {reverse => unmaintained/reverse}/docker-compose.yml (100%)
 rename {reverse => unmaintained/reverse}/rootfs/etc/s6.d/.s6-svscan/finish (100%)
 rename {reverse => unmaintained/reverse}/rootfs/etc/s6.d/check_certs/run (100%)
 rename {reverse => unmaintained/reverse}/rootfs/etc/s6.d/nginx/run (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ct.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/headers.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/hsts.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ocsp.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/proxy.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf.d/ssl.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/conf/nginx.conf (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/path.d/template (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/path.d/template_auth (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/sites-enabled/template (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/sites-enabled/template_ssl (100%)
 rename {reverse => unmaintained/reverse}/rootfs/nginx/www/letsencrypt (100%)
 rename {reverse => unmaintained/reverse}/rootfs/usr/local/bin/check_certs (100%)
 rename {reverse => unmaintained/reverse}/rootfs/usr/local/bin/startup (100%)

diff --git a/cryptpad/Dockerfile b/unmaintained/cryptpad/Dockerfile
similarity index 100%
rename from cryptpad/Dockerfile
rename to unmaintained/cryptpad/Dockerfile
diff --git a/cryptpad/README.md b/unmaintained/cryptpad/README.md
similarity index 100%
rename from cryptpad/README.md
rename to unmaintained/cryptpad/README.md
diff --git a/cryptpad/run.sh b/unmaintained/cryptpad/run.sh
similarity index 100%
rename from cryptpad/run.sh
rename to unmaintained/cryptpad/run.sh
diff --git a/isso/Dockerfile b/unmaintained/isso/Dockerfile
similarity index 100%
rename from isso/Dockerfile
rename to unmaintained/isso/Dockerfile
diff --git a/isso/README.md b/unmaintained/isso/README.md
similarity index 100%
rename from isso/README.md
rename to unmaintained/isso/README.md
diff --git a/isso/run.sh b/unmaintained/isso/run.sh
similarity index 100%
rename from isso/run.sh
rename to unmaintained/isso/run.sh
diff --git a/reverse/Dockerfile b/unmaintained/reverse/Dockerfile
similarity index 100%
rename from reverse/Dockerfile
rename to unmaintained/reverse/Dockerfile
diff --git a/reverse/README.md b/unmaintained/reverse/README.md
similarity index 100%
rename from reverse/README.md
rename to unmaintained/reverse/README.md
diff --git a/reverse/auto_upgrade.sh b/unmaintained/reverse/auto_upgrade.sh
similarity index 100%
rename from reverse/auto_upgrade.sh
rename to unmaintained/reverse/auto_upgrade.sh
diff --git a/reverse/docker-compose.yml b/unmaintained/reverse/docker-compose.yml
similarity index 100%
rename from reverse/docker-compose.yml
rename to unmaintained/reverse/docker-compose.yml
diff --git a/reverse/rootfs/etc/s6.d/.s6-svscan/finish b/unmaintained/reverse/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from reverse/rootfs/etc/s6.d/.s6-svscan/finish
rename to unmaintained/reverse/rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/reverse/rootfs/etc/s6.d/check_certs/run b/unmaintained/reverse/rootfs/etc/s6.d/check_certs/run
similarity index 100%
rename from reverse/rootfs/etc/s6.d/check_certs/run
rename to unmaintained/reverse/rootfs/etc/s6.d/check_certs/run
diff --git a/reverse/rootfs/etc/s6.d/nginx/run b/unmaintained/reverse/rootfs/etc/s6.d/nginx/run
similarity index 100%
rename from reverse/rootfs/etc/s6.d/nginx/run
rename to unmaintained/reverse/rootfs/etc/s6.d/nginx/run
diff --git a/reverse/rootfs/nginx/conf.d/ct.conf b/unmaintained/reverse/rootfs/nginx/conf.d/ct.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/ct.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/ct.conf
diff --git a/reverse/rootfs/nginx/conf.d/headers.conf b/unmaintained/reverse/rootfs/nginx/conf.d/headers.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/headers.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/headers.conf
diff --git a/reverse/rootfs/nginx/conf.d/hsts.conf b/unmaintained/reverse/rootfs/nginx/conf.d/hsts.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/hsts.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/hsts.conf
diff --git a/reverse/rootfs/nginx/conf.d/ocsp.conf b/unmaintained/reverse/rootfs/nginx/conf.d/ocsp.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/ocsp.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/ocsp.conf
diff --git a/reverse/rootfs/nginx/conf.d/proxy.conf b/unmaintained/reverse/rootfs/nginx/conf.d/proxy.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/proxy.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/proxy.conf
diff --git a/reverse/rootfs/nginx/conf.d/ssl.conf b/unmaintained/reverse/rootfs/nginx/conf.d/ssl.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf.d/ssl.conf
rename to unmaintained/reverse/rootfs/nginx/conf.d/ssl.conf
diff --git a/reverse/rootfs/nginx/conf/nginx.conf b/unmaintained/reverse/rootfs/nginx/conf/nginx.conf
similarity index 100%
rename from reverse/rootfs/nginx/conf/nginx.conf
rename to unmaintained/reverse/rootfs/nginx/conf/nginx.conf
diff --git a/reverse/rootfs/nginx/path.d/template b/unmaintained/reverse/rootfs/nginx/path.d/template
similarity index 100%
rename from reverse/rootfs/nginx/path.d/template
rename to unmaintained/reverse/rootfs/nginx/path.d/template
diff --git a/reverse/rootfs/nginx/path.d/template_auth b/unmaintained/reverse/rootfs/nginx/path.d/template_auth
similarity index 100%
rename from reverse/rootfs/nginx/path.d/template_auth
rename to unmaintained/reverse/rootfs/nginx/path.d/template_auth
diff --git a/reverse/rootfs/nginx/sites-enabled/template b/unmaintained/reverse/rootfs/nginx/sites-enabled/template
similarity index 100%
rename from reverse/rootfs/nginx/sites-enabled/template
rename to unmaintained/reverse/rootfs/nginx/sites-enabled/template
diff --git a/reverse/rootfs/nginx/sites-enabled/template_ssl b/unmaintained/reverse/rootfs/nginx/sites-enabled/template_ssl
similarity index 100%
rename from reverse/rootfs/nginx/sites-enabled/template_ssl
rename to unmaintained/reverse/rootfs/nginx/sites-enabled/template_ssl
diff --git a/reverse/rootfs/nginx/www/letsencrypt b/unmaintained/reverse/rootfs/nginx/www/letsencrypt
similarity index 100%
rename from reverse/rootfs/nginx/www/letsencrypt
rename to unmaintained/reverse/rootfs/nginx/www/letsencrypt
diff --git a/reverse/rootfs/usr/local/bin/check_certs b/unmaintained/reverse/rootfs/usr/local/bin/check_certs
similarity index 100%
rename from reverse/rootfs/usr/local/bin/check_certs
rename to unmaintained/reverse/rootfs/usr/local/bin/check_certs
diff --git a/reverse/rootfs/usr/local/bin/startup b/unmaintained/reverse/rootfs/usr/local/bin/startup
similarity index 100%
rename from reverse/rootfs/usr/local/bin/startup
rename to unmaintained/reverse/rootfs/usr/local/bin/startup

From 411f48cd9c37da58847859b9170b8105dc4f571e Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 6 Dec 2017 14:03:37 +0100
Subject: [PATCH 024/328] [nextcloud] update README

---
 nextcloud/README.md | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index a0128ed3..da3f42fd 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -8,6 +8,7 @@
 **This image was made for my own use and I have no intention to make this official. Support won't be regular so if there's an update, or a fix, you can open a pull request. Any contribution is welcome, but please be aware I'm very busy currently. Before opening an issue, please check if there's already one related. Also please use Github instead of Docker Hub, otherwise I won't see your comments. Thanks.**
 
 ### Features
+- Based on wonderfall/dockerfiles (Thanks!)
 - Based on Alpine Linux.
 - Bundled with nginx and PHP 7.1 (hoellen/nginx-php image).
 - Automatic installation using environment variables.
@@ -25,8 +26,6 @@
 - **latest** : latest stable version. (12.0)
 - **12.0** : latest 12.0.x version (stable)
 - **11.0** : latest 11.0.x version (old stable)
-- **10.0** : latest 10.0.x version (old stable) (unmaintained)
-- **9.0** : latest 9.0.x version. (old stable) (unmaintained)
 - **daily** : latest code (daily build).
 
 Other tags than `daily` are built weekly. For security reasons, you should occasionally update the container, even if you have the latest version of Nextcloud.
@@ -219,38 +218,5 @@ Of course you can use your own solution! nginx, Haproxy, Caddy, h2o, Traefik...
 
 Whatever your choice is, you have to know that headers are already sent by the container, including HSTS, so there's no need to add them again. **It is strongly recommended (I'd like to say : MANDATORY) to use Nextcloud through an encrypted connection (HTTPS).** [Let's Encrypt](https://letsencrypt.org/) provides free SSL/TLS certificates, so you have no excuses.
 
-You can take a look at my brand new image [wonderfall/reverse](https://hub.docker.com/r/wonderfall/reverse/). It was made with security and ease-of-use in mind, using the latest versions of nginx and OpenSSL. It also provides SSL/TLS automation with [lego](https://github.com/xenolf/lego), a Let's Encrypt client. Also, no need to bother about configuration files! This image does litterally everything for you.
-
-Look at how simple it is. First, you have to add labels to your Nextcloud container, like this:
-
-```
-  nextcloud:
-  ...
-    labels:
-      - reverse.frontend.domain=cloud.domain.tld
-      - reverse.backend.port=8888
-      - reverse.frontend.ssl=true
-      - reverse.frontend.ssltype=ec384
-      - reverse.frontend.hsts=false
-      - reverse.frontend.headers=false
-```
-
-These labels can tell the reverse container what settings should be set when generating files/certificates for Nextcloud. Now you can add the reverse container in your docker-compose file, and you need to provide it your `EMAIL` (for Let's Encrypt), and bind it to the nextcloud container :
-
-```
-  reverse:
-    image: wonderfall/reverse
-    container_name: reverse
-    ports:
-      - "80:8080"
-      - "443:8443"
-    environment:
-      - EMAIL=admin@domain.tld
-    volumes:
-      - /docker/reverse/ssl:/nginx/ssl
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      - nextcloud
-```
 
 That's it! Did I lie to you?

From 883fc68041d8363261fddcdc8b8a27ad9eb7ed05 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 6 Dec 2017 14:05:58 +0100
Subject: [PATCH 025/328] [privatebin] update Dockerfile and README

---
 privatebin/Dockerfile | 4 ++--
 privatebin/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 7c1f8883..26b9ba9a 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,4 +1,4 @@
-FROM wonderfall/nginx-php
+FROM hoellen/nginx-php
 
 ARG PRIVATEBIN_VER=1.1.1
 
@@ -23,7 +23,7 @@ VOLUME /privatebin/data /php/session
 
 EXPOSE 8888
 
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
+LABEL maintainer="hoellen <info@hoellen.eu>" \
       description="A minimalist, open source online pastebin where the server has zero knowledge of pasted data" \
       version="PrivateBin 1.1.1"
 
diff --git a/privatebin/README.md b/privatebin/README.md
index 70808c04..078154c3 100644
--- a/privatebin/README.md
+++ b/privatebin/README.md
@@ -1,9 +1,9 @@
-## wonderfall/privatebin
+## hoellen/privatebin
 
 Paste securely.
 
 #### Features
-- Based on Alpine Linux (wonderfall/nginx-php image)
+- Based on Alpine Linux (hoellen/nginx-php image)
 - Uses [PrivateBin](https://github.com/PrivateBin/PrivateBin), originally a fork of zerobin by elrido.
 - Bundled with nginx and PHP7.1.
 

From 13d545b67365a2a6d8e4042197302878d60807c1 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 6 Dec 2017 15:06:45 +0100
Subject: [PATCH 026/328] [privatebin] update Dockerfile

---
 privatebin/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 26b9ba9a..f0a92088 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -6,12 +6,11 @@ ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \
     MEMORY_LIMIT=128M
 
-RUN echo " https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && BUILD_DEPS="tar libressl ca-certificates" \
+RUN BUILD_DEPS="tar libressl ca-certificates" \
  && apk -U upgrade && apk add $BUILD_DEPS \
  && mkdir privatebin && cd privatebin \
  && wget -qO- https://github.com/PrivateBin/PrivateBin/archive/${PRIVATEBIN_VER}.tar.gz | tar xz --strip 1 \
- && mv cfg/conf.ini.sample cfg/conf.ini \
+ && mv cfg/conf.sample.php cfg/conf.php \
  && apk del $BUILD_DEPS \
  && rm -f /var/cache/apk/*
 

From afde2d99b4cf2e8d0350ced6d09d724e80f03dd3 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 6 Dec 2017 16:52:19 +0100
Subject: [PATCH 027/328] update repo readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index cfa28c6d..fff8385c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # dockerfiles
 Based on [Wonderfall Dockerfiles](https://github.com/Wonderfall/dockerfiles)
+
+There are for some services **automated builds** on [Docker](https://hub.docker.com/u/hoellen).

From 365da5b6414641f66cb30b5407bc6eae9aad9e27 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 7 Dec 2017 23:29:06 +0100
Subject: [PATCH 028/328] [nginx-php] downgrade php to 7.1.11 because of
 Narrowing error (see #1)

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 86861519..8c892aed 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.6
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.7
-ARG PHP_VER=7.1.12
+ARG PHP_VER=7.1.11
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From a7d46dd53b3c3a4ba889deaec8f2a2b59b46c100 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 12 Dec 2017 18:37:55 +0100
Subject: [PATCH 029/328] [nextcloud] fix typo

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index da3f42fd..1677cb1a 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -211,7 +211,7 @@ Redis can be used for distributed and file locking cache, alongside with APCu (l
 You will have to deploy a Solr server, I've shown an example above with docker-compose. Once Nextant app is installed, go to "additional settings" in your admin pannel and use http://solr:8983/solr as "Adress of your Solr Servlet". There you go!
 
 ### Tip : how to use occ command
-There is a script for that, so you shouldn't bother to log into the container, set the right permissions, and so on. Just use `docker exec -ti nexcloud occ command`.
+There is a script for that, so you shouldn't bother to log into the container, set the right permissions, and so on. Just use `docker exec -ti nextcloud occ command`.
 
 ### Reverse proxy
 Of course you can use your own solution! nginx, Haproxy, Caddy, h2o, Traefik...

From 0d652bc6506284f61a31b9e3eba6033f358ab79c Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 12 Dec 2017 18:39:14 +0100
Subject: [PATCH 030/328] [boring-nginx] update Alpine back to 3.7

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 4c6f3ef2..0d2840f1 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 ENV UID=991 GID=991
 

From a5909ca0c6ed019781ddba19fc79f576128abfa3 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 12 Dec 2017 18:40:46 +0100
Subject: [PATCH 031/328] [nginx-php] update Alpine to 3.7

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 8c892aed..3f4c5fef 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 ARG BUILD_CORES
 

From 8f9c2b0d2e73e503377ebbcf7d8e51f4edb32494 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 12 Dec 2017 22:15:38 +0100
Subject: [PATCH 032/328] [searx] update Alpine 3.7

---
 searx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index 163ddf7c..d0070480 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 ARG VERSION=0.13.1
 

From 91ed113a9033770b198eef22727d1568c6988b74 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 20 Dec 2017 17:08:13 +0100
Subject: [PATCH 033/328] [nginx-php] fix build error on docker hub

---
 nginx-php/7.1/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 3f4c5fef..10ff63a7 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -177,6 +177,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
  && make clean \
  && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
+ && sleep 1 \
  && docker-php-ext-install ${PHP_EXT_LIST} \
  && apk del ${BUILD_DEPS} \
  && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \

From 355b093cd38f727003bd2faf71e9be480983991a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 22 Dec 2017 12:56:37 +0100
Subject: [PATCH 034/328] [nextcloud] update microbadger to this repo

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 1677cb1a..856bcc19 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -1,7 +1,7 @@
 ## hoellen/nextcloud
 
 
-[![](https://images.microbadger.com/badges/version/wonderfall/nextcloud.svg)](http://microbadger.com/images/wonderfall/nextcloud "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/wonderfall/nextcloud.svg)](http://microbadger.com/images/wonderfall/nextcloud "Get your own image badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/hoellen/nextcloud.svg)](http://microbadger.com/images/hoellen/nextcloud "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/hoellen/nextcloud.svg)](http://microbadger.com/images/hoellen/nextcloud "Get your own image badge on microbadger.com")
 
 ![](https://s32.postimg.org/69nev7aol/Nextcloud_logo.png)
 

From 64bf24a04bd64fc526c99775c00cf0a275c31646 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 22 Dec 2017 13:02:32 +0100
Subject: [PATCH 035/328] [boring-nginx] update maintainer

---
 boring-nginx/Dockerfile | 2 +-
 boring-nginx/README.md  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 0d2840f1..609d7afb 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -113,6 +113,6 @@ VOLUME /sites-enabled /www /conf.d /passwds /certs /var/log/nginx
 LABEL description="nginx built from source" \
       openssl="BoringSSL" \
       nginx="nginx ${NGINX_VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
+      maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]
diff --git a/boring-nginx/README.md b/boring-nginx/README.md
index ba22cd0b..369ebf92 100644
--- a/boring-nginx/README.md
+++ b/boring-nginx/README.md
@@ -1,4 +1,4 @@
-## wonderfall/boring-nginx
+## hoellen/boring-nginx
 
 ![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/115px-Nginx_logo.svg.png)
 
@@ -6,6 +6,7 @@
 This is nginx statically linked against BoringSSL, with embedded Brotli support.
 
 #### Features
+- Thanks to [Wonderfall](https://github.com/wonderfall/dockerfiles)
 - Based on Alpine Linux.
 - nginx built against **BoringSSL** with SSE/SHA, and AVX2 SIMD-instructions.
 - **TLS 1.3** patch : use of TLS 1.3 DRAFT is enforced (haven't found another way yet).

From d9645952bb737cf8e4ec056a30c22db4a6f1d290 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 27 Dec 2017 09:55:38 +0100
Subject: [PATCH 036/328] [boring-nginx] [nginx-php] update nginx 1.13.8

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/7.1/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 609d7afb..d60bd02e 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.7
+ARG NGINX_VERSION=1.13.8
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 10ff63a7..8e1bb939 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.7
+ARG NGINX_VER=1.13.8
 ARG PHP_VER=7.1.11
 ARG LIBICONV_VERSION=1.15
 

From effe07499bfd09e8134b8a81803f04c044fff0e9 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 4 Jan 2018 19:39:20 +0100
Subject: [PATCH 037/328] [nginx-php] update php to 7.1.13

---
 nginx-php/7.1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 8e1bb939..86e5ea5a 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.8
-ARG PHP_VER=7.1.11
+ARG PHP_VER=7.1.13
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 842e24af493609c012392d484ca984b448c5a5ee Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Thu, 11 Jan 2018 15:11:45 +0100
Subject: [PATCH 038/328] [nginx-php] create php 7.2 tag

---
 nginx-php/{7.1/Dockerfile => Dockerfile.7.1}  |   0
 nginx-php/Dockerfile.7.2                      | 183 ++++++++++++++++++
 .../rootfs/etc/s6.d/.s6-svscan/finish         |   0
 nginx-php/{7.1 => }/rootfs/etc/s6.d/nginx/run |   0
 nginx-php/{7.1 => }/rootfs/etc/s6.d/php/run   |   0
 .../{7.1 => }/rootfs/nginx/conf.d/php.conf    |   0
 .../{7.1 => }/rootfs/nginx/conf/nginx.conf    |   0
 .../{7.1 => }/rootfs/php/etc/php-fpm.conf     |   0
 .../usr/local/bin/docker-php-ext-configure    |   0
 .../usr/local/bin/docker-php-ext-enable       |   0
 .../usr/local/bin/docker-php-ext-install      |   0
 11 files changed, 183 insertions(+)
 rename nginx-php/{7.1/Dockerfile => Dockerfile.7.1} (100%)
 create mode 100644 nginx-php/Dockerfile.7.2
 rename nginx-php/{7.1 => }/rootfs/etc/s6.d/.s6-svscan/finish (100%)
 rename nginx-php/{7.1 => }/rootfs/etc/s6.d/nginx/run (100%)
 rename nginx-php/{7.1 => }/rootfs/etc/s6.d/php/run (100%)
 rename nginx-php/{7.1 => }/rootfs/nginx/conf.d/php.conf (100%)
 rename nginx-php/{7.1 => }/rootfs/nginx/conf/nginx.conf (100%)
 rename nginx-php/{7.1 => }/rootfs/php/etc/php-fpm.conf (100%)
 rename nginx-php/{7.1 => }/rootfs/usr/local/bin/docker-php-ext-configure (100%)
 rename nginx-php/{7.1 => }/rootfs/usr/local/bin/docker-php-ext-enable (100%)
 rename nginx-php/{7.1 => }/rootfs/usr/local/bin/docker-php-ext-install (100%)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/Dockerfile.7.1
similarity index 100%
rename from nginx-php/7.1/Dockerfile
rename to nginx-php/Dockerfile.7.1
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
new file mode 100644
index 00000000..896d90fb
--- /dev/null
+++ b/nginx-php/Dockerfile.7.2
@@ -0,0 +1,183 @@
+FROM alpine:3.7
+
+ARG BUILD_CORES
+
+ARG NGINX_VER=1.13.8
+ARG PHP_VER=7.2.1
+ARG LIBICONV_VERSION=1.15
+
+LABEL description="nginx + php image based on Alpine" \
+      maintainer="hoellen info@hoellen.eu" \
+      php_version="PHP v$PHP_VER built from source" \
+      nginx_version="nginx v$NGINX_VER built from source"
+
+ARG PHP_MIRROR=http://ch1.php.net
+
+ARG NGINX_CONF=" \
+    --prefix=/nginx \
+    --sbin-path=/usr/local/sbin/nginx \
+    --http-log-path=/nginx/logs/access.log \
+    --error-log-path=/nginx/logs/error.log \
+    --pid-path=/nginx/run/nginx.pid \
+    --lock-path=/nginx/run/nginx.lock \
+    --with-threads \
+    --with-file-aio \
+    --without-http_geo_module \
+    --without-http_autoindex_module \
+    --without-http_split_clients_module \
+    --without-http_memcached_module \
+    --without-http_empty_gif_module \
+    --without-http_browser_module"
+
+ARG PHP_CONF=" \
+    --prefix=/usr \
+    --libdir=/usr/lib/php \
+    --datadir=/usr/share/php \
+    --sysconfdir=/php/etc \
+    --localstatedir=/php/var \
+    --with-pear=/usr/share/php \
+    --with-config-file-scan-dir=/php/conf.d \
+    --with-config-file-path=/php \
+    --with-pic \
+    --disable-short-tags \
+    --without-readline \
+    --enable-bcmath=shared \
+    --enable-fpm \
+    --disable-cgi \
+    --enable-mysqlnd \
+    --enable-mbstring \
+    --with-curl \
+    --with-libedit \
+    --with-openssl \
+    --with-iconv=/usr/local \
+    --with-gd \
+    --with-jpeg-dir \
+    --with-png-dir \
+    --with-webp-dir \
+    --with-xpm-dir=no \
+    --with-freetype-dir \
+    --disable-gd-jis-conv \
+    --with-zlib"
+
+ARG PHP_EXT_LIST=" \
+    mysqli \
+    ctype \
+    dom \
+    json \
+    xml \
+    mbstring \
+    posix \
+    xmlwriter \
+    zip \
+    zlib \
+    sqlite3 \
+    pdo_sqlite \
+    pdo_pgsql \
+    pdo_mysql \
+    pcntl \
+    curl \
+    fileinfo \
+    bz2 \
+    intl \
+    mcrypt \
+    openssl \
+    ldap \
+    simplexml \
+    pgsql \
+    ftp \
+    exif \
+    gmp \
+    imap"
+
+ARG CUSTOM_BUILD_PKGS=" \
+    freetype-dev \
+    openldap-dev \
+    gmp-dev \
+    libmcrypt-dev \
+    icu-dev \
+    postgresql-dev \
+    libpng-dev \
+    libwebp-dev \
+    gd-dev \
+    libjpeg-turbo-dev \
+    libxpm-dev \
+    libedit-dev \
+    libxml2-dev \
+    libressl-dev \
+    libbz2 \
+    sqlite-dev \
+    imap-dev"
+
+ARG CUSTOM_PKGS=" \
+    freetype \
+    openldap \
+    gmp \
+    libmcrypt \
+    bzip2-dev \
+    icu \
+    libpq \
+    c-client"
+
+COPY rootfs /
+
+RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
+ && BUILD_DEPS=" \
+    linux-headers \
+    libtool \
+    build-base \
+    pcre-dev \
+    zlib-dev \
+    wget \
+    gnupg \
+    autoconf \
+    gcc \
+    g++ \
+    libc-dev \
+    make \
+    pkgconf \
+    curl-dev \
+    ca-certificates \
+    ${CUSTOM_BUILD_PKGS}" \
+ && apk -U add \
+    ${BUILD_DEPS} \
+    s6 \
+    su-exec \
+    curl \
+    libedit \
+    libxml2 \
+    libressl \
+    libwebp \
+    gd \
+    pcre \
+    zlib \
+    ${CUSTOM_PKGS} \
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz.asc/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz.asc \
+ && wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz -O /tmp/libiconv-${LIBICONV_VERSION}.tar.gz \
+ && mkdir -p /php/conf.d \
+ && mkdir -p /usr/src \
+ && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
+ && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
+ && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
+ && cd /usr/src/nginx-${NGINX_VER} \
+ && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+ && cd /usr/src/libiconv-${LIBICONV_VERSION} \
+ && ./configure --prefix=/usr/local \
+ && make && make install && libtool --finish /usr/local/lib \
+ && mv /usr/src/php-${PHP_VER} /usr/src/php \
+ && cd /usr/src/php \
+ && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
+ && make clean \
+ && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
+ && sleep 1 \
+ && docker-php-ext-install ${PHP_EXT_LIST} \
+ && apk del ${BUILD_DEPS} \
+ && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
+ && mkdir -p /nginx/logs /nginx/run /php/php-fpm.d /php/logs /php/run /php/session
diff --git a/nginx-php/7.1/rootfs/etc/s6.d/.s6-svscan/finish b/nginx-php/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from nginx-php/7.1/rootfs/etc/s6.d/.s6-svscan/finish
rename to nginx-php/rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/nginx-php/7.1/rootfs/etc/s6.d/nginx/run b/nginx-php/rootfs/etc/s6.d/nginx/run
similarity index 100%
rename from nginx-php/7.1/rootfs/etc/s6.d/nginx/run
rename to nginx-php/rootfs/etc/s6.d/nginx/run
diff --git a/nginx-php/7.1/rootfs/etc/s6.d/php/run b/nginx-php/rootfs/etc/s6.d/php/run
similarity index 100%
rename from nginx-php/7.1/rootfs/etc/s6.d/php/run
rename to nginx-php/rootfs/etc/s6.d/php/run
diff --git a/nginx-php/7.1/rootfs/nginx/conf.d/php.conf b/nginx-php/rootfs/nginx/conf.d/php.conf
similarity index 100%
rename from nginx-php/7.1/rootfs/nginx/conf.d/php.conf
rename to nginx-php/rootfs/nginx/conf.d/php.conf
diff --git a/nginx-php/7.1/rootfs/nginx/conf/nginx.conf b/nginx-php/rootfs/nginx/conf/nginx.conf
similarity index 100%
rename from nginx-php/7.1/rootfs/nginx/conf/nginx.conf
rename to nginx-php/rootfs/nginx/conf/nginx.conf
diff --git a/nginx-php/7.1/rootfs/php/etc/php-fpm.conf b/nginx-php/rootfs/php/etc/php-fpm.conf
similarity index 100%
rename from nginx-php/7.1/rootfs/php/etc/php-fpm.conf
rename to nginx-php/rootfs/php/etc/php-fpm.conf
diff --git a/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure b/nginx-php/rootfs/usr/local/bin/docker-php-ext-configure
similarity index 100%
rename from nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
rename to nginx-php/rootfs/usr/local/bin/docker-php-ext-configure
diff --git a/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-enable b/nginx-php/rootfs/usr/local/bin/docker-php-ext-enable
similarity index 100%
rename from nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-enable
rename to nginx-php/rootfs/usr/local/bin/docker-php-ext-enable
diff --git a/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-install b/nginx-php/rootfs/usr/local/bin/docker-php-ext-install
similarity index 100%
rename from nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-install
rename to nginx-php/rootfs/usr/local/bin/docker-php-ext-install

From 20c258afb6fad78bf33383ea9c297d211f424277 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Thu, 11 Jan 2018 16:54:03 +0100
Subject: [PATCH 039/328] [nginx-php] delete mcrypt in php 7.2 (has been
 removed)

---
 nginx-php/Dockerfile.7.2 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 896d90fb..d64a63f2 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -79,7 +79,6 @@ ARG PHP_EXT_LIST=" \
     fileinfo \
     bz2 \
     intl \
-    mcrypt \
     openssl \
     ldap \
     simplexml \
@@ -93,7 +92,6 @@ ARG CUSTOM_BUILD_PKGS=" \
     freetype-dev \
     openldap-dev \
     gmp-dev \
-    libmcrypt-dev \
     icu-dev \
     postgresql-dev \
     libpng-dev \
@@ -112,7 +110,6 @@ ARG CUSTOM_PKGS=" \
     freetype \
     openldap \
     gmp \
-    libmcrypt \
     bzip2-dev \
     icu \
     libpq \

From 496738b91d3b239e0c81e1ff2b0902231362cc05 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Thu, 11 Jan 2018 20:55:03 +0100
Subject: [PATCH 040/328] [nextcloud] add nextcloud 13.0.0 RC1

---
 nextcloud/Dockerfile.13.0 | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 nextcloud/Dockerfile.13.0

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
new file mode 100644
index 00000000..f9b0166f
--- /dev/null
+++ b/nextcloud/Dockerfile.13.0
@@ -0,0 +1,71 @@
+FROM hoellen/nginx-php:7.2
+
+ARG NEXTCLOUD_VERSION=13.0.0RC1
+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 \
+    CRON_PERIOD=15m \
+    CRON_MEMORY_LIMIT=1g \
+    TZ=Etc/UTC \
+    DB_TYPE=sqlite3 \
+    DOMAIN=localhost
+
+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/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From b8f13818a53241dbc54a997be4ba407cec0632c7 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Sun, 21 Jan 2018 11:19:25 +0100
Subject: [PATCH 041/328] [nextcloud] update to 13.0 RC2

---
 nextcloud/Dockerfile.13.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index f9b0166f..acaa92e7 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.0RC1
+ARG NEXTCLOUD_VERSION=13.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 792ab407e13cf5afbd73a5b3a291d8bf280db369 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Sun, 21 Jan 2018 11:21:33 +0100
Subject: [PATCH 042/328] [nextcloud] update README.md

---
 nextcloud/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 856bcc19..f1244e59 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -24,6 +24,7 @@
 
 ### Tags
 - **latest** : latest stable version. (12.0)
+- **13.0** : latest 13.0.x version (beta)
 - **12.0** : latest 12.0.x version (stable)
 - **11.0** : latest 11.0.x version (old stable)
 - **daily** : latest code (daily build).

From afd3d476fdc578a8f1a13aab7aeb2cb73d019723 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Mon, 22 Jan 2018 22:30:12 +0100
Subject: [PATCH 043/328] UNMAINTAINED

---
 piwik/Dockerfile                              |  57 ---------------
 piwik/README.md                               |  68 ------------------
 piwik/rootfs/nginx/sites-enabled/nginx.conf   |  46 ------------
 piwik/rootfs/php/conf.d/opcache.ini           |   8 ---
 piwik/rootfs/usr/local/bin/run.sh             |  13 ----
 .../libresonic}/Dockerfile                    |   0
 .../libresonic}/README.md                     |   0
 .../libresonic}/run.sh                        |   0
 {lychee => unmaintained/lychee}/Dockerfile    |   0
 {lychee => unmaintained/lychee}/README.md     |   0
 {lychee => unmaintained/lychee}/nginx.conf    |   0
 {lychee => unmaintained/lychee}/php-fpm.conf  |   0
 {lychee => unmaintained/lychee}/run.sh        |   0
 .../lychee}/s6.d/.s6-svscan/finish            |   0
 .../lychee}/s6.d/nginx/run                    |   0
 {lychee => unmaintained/lychee}/s6.d/php/run  |   0
 .../mastodon}/Dockerfile.master               |   0
 .../mastodon}/Dockerfile.stable               |   0
 .../mastodon}/Dockerfile.targaryen            |   0
 {mastodon => unmaintained/mastodon}/README.md |   0
 .../rootfs/etc/s6.d/.s6-svscan/finish         |   0
 .../mastodon}/rootfs/etc/s6.d/sidekiq/run     |   0
 .../mastodon}/rootfs/etc/s6.d/streaming/run   |   0
 .../mastodon}/rootfs/etc/s6.d/web/run         |   0
 .../mastodon}/rootfs/usr/local/bin/run        |   0
 .../app/javascript/images/elephant-friend.png | Bin
 .../targaryen/app/javascript/images/logo.svg  |   0
 .../app/javascript/images/logo_alt.svg        |   0
 .../app/javascript/images/logo_full.svg       |   0
 .../images/mastodon-getting-started.png       | Bin
 .../javascript/images/mastodon-not-found.png  | Bin
 .../app/javascript/styles/variables.scss      |   0
 .../public/android-chrome-192x192.png         | Bin
 .../targaryen/public/apple-touch-icon.png     | Bin
 .../public/avatars/original/missing.png       | Bin
 .../mastodon}/targaryen/public/favicon.ico    | Bin
 .../targaryen/public/mstile-150x150.png       | Bin
 .../mastodon}/targaryen/public/oops.png       | Bin
 .../mastodon}/targaryen/targaryen.sh          |   0
 .../rtorrent-flood}/Dockerfile                |   0
 .../rtorrent-flood}/README.md                 |   0
 .../rtorrent-flood}/config.js                 |   0
 .../rtorrent-flood}/postdl                    |   0
 .../rtorrent-flood}/postrm                    |   0
 .../rtorrent-flood}/rtorrent.rc               |   0
 .../rtorrent-flood}/run.sh                    |   0
 .../rtorrent-flood}/s6.d/.s6-svscan/finish    |   0
 .../rtorrent-flood}/s6.d/flood/run            |   0
 .../rtorrent-flood}/s6.d/rtorrent/run         |   0
 49 files changed, 192 deletions(-)
 delete mode 100644 piwik/Dockerfile
 delete mode 100644 piwik/README.md
 delete mode 100644 piwik/rootfs/nginx/sites-enabled/nginx.conf
 delete mode 100644 piwik/rootfs/php/conf.d/opcache.ini
 delete mode 100644 piwik/rootfs/usr/local/bin/run.sh
 rename {libresonic => unmaintained/libresonic}/Dockerfile (100%)
 rename {libresonic => unmaintained/libresonic}/README.md (100%)
 rename {libresonic => unmaintained/libresonic}/run.sh (100%)
 rename {lychee => unmaintained/lychee}/Dockerfile (100%)
 rename {lychee => unmaintained/lychee}/README.md (100%)
 rename {lychee => unmaintained/lychee}/nginx.conf (100%)
 rename {lychee => unmaintained/lychee}/php-fpm.conf (100%)
 rename {lychee => unmaintained/lychee}/run.sh (100%)
 rename {lychee => unmaintained/lychee}/s6.d/.s6-svscan/finish (100%)
 rename {lychee => unmaintained/lychee}/s6.d/nginx/run (100%)
 rename {lychee => unmaintained/lychee}/s6.d/php/run (100%)
 rename {mastodon => unmaintained/mastodon}/Dockerfile.master (100%)
 rename {mastodon => unmaintained/mastodon}/Dockerfile.stable (100%)
 rename {mastodon => unmaintained/mastodon}/Dockerfile.targaryen (100%)
 rename {mastodon => unmaintained/mastodon}/README.md (100%)
 rename {mastodon => unmaintained/mastodon}/rootfs/etc/s6.d/.s6-svscan/finish (100%)
 rename {mastodon => unmaintained/mastodon}/rootfs/etc/s6.d/sidekiq/run (100%)
 rename {mastodon => unmaintained/mastodon}/rootfs/etc/s6.d/streaming/run (100%)
 rename {mastodon => unmaintained/mastodon}/rootfs/etc/s6.d/web/run (100%)
 rename {mastodon => unmaintained/mastodon}/rootfs/usr/local/bin/run (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/elephant-friend.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/logo.svg (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/logo_alt.svg (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/logo_full.svg (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/mastodon-getting-started.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/images/mastodon-not-found.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/app/javascript/styles/variables.scss (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/android-chrome-192x192.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/apple-touch-icon.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/avatars/original/missing.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/favicon.ico (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/mstile-150x150.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/public/oops.png (100%)
 rename {mastodon => unmaintained/mastodon}/targaryen/targaryen.sh (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/Dockerfile (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/README.md (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/config.js (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/postdl (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/postrm (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/rtorrent.rc (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/run.sh (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/s6.d/.s6-svscan/finish (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/s6.d/flood/run (100%)
 rename {rtorrent-flood => unmaintained/rtorrent-flood}/s6.d/rtorrent/run (100%)

diff --git a/piwik/Dockerfile b/piwik/Dockerfile
deleted file mode 100644
index a2d40e2a..00000000
--- a/piwik/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM wonderfall/nginx-php:7.1
-
-ARG VERSION=3.2.0
-ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
-
-ENV UID=991 GID=991 \
-    UPLOAD_MAX_SIZE=10M \
-    MEMORY_LIMIT=256M \
-    OPCACHE_MEM_SIZE=128M
-
-RUN BUILD_DEPS=" \
-    git \
-    tar \
-    build-base \
-    autoconf \
-    geoip-dev \
-    libressl \
-    ca-certificates \
-    gnupg" \
- && apk -U upgrade && apk add \
-    ${BUILD_DEPS} \
-    geoip \
-    tzdata \
- && pecl install geoip-1.1.1 \
- && echo 'extension=geoip.so' >> /php/conf.d/geoip.ini \
- && mkdir /piwik && cd /tmp \
- && PIWIK_TARBALL="piwik-${VERSION}.tar.gz" \
- && wget -q https://builds.piwik.org/${PIWIK_TARBALL} \
- && wget -q https://builds.piwik.org/${PIWIK_TARBALL}.asc \
- && wget -q https://builds.piwik.org/signature.asc \
- && echo "Verifying authenticity of ${PIWIK_TARBALL}..." \
- && gpg --import signature.asc \
- && FINGERPRINT="$(LANG=C gpg --verify ${PIWIK_TARBALL}.asc ${PIWIK_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_matthieu}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
- && echo "All seems good, now unpacking ${PIWIK_TARBALL}..." \
- && tar xzf ${PIWIK_TARBALL} --strip 1 -C /piwik \
- && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /usr/share/GeoIP/ \
- && gzip -d /usr/share/GeoIP/GeoLiteCity.dat.gz \
- && mv /usr/share/GeoIP/GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat \
- && apk del ${BUILD_DEPS} php7-dev php7-pear \
- && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /config
-
-EXPOSE 8888
-
-LABEL description "Open web analytics platform" \
-      piwik "Piwik v${VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
-
-CMD ["run.sh"]
diff --git a/piwik/README.md b/piwik/README.md
deleted file mode 100644
index 3724e8a2..00000000
--- a/piwik/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-## wonderfall/piwik
-
-![](https://i.goopics.net/m3.png)
-
-#### What is this?
-It is a web analytics platform. Piwik respects your privacy and gives you full control over your data.
-
-#### Features
-- Based on Alpine Linux.
-- Latest Piwik stable.
-- nginx stable + PHP7.
-- mysql drivers (server not built-in).
-- Latest GeoLite City Database from maxmind.com.
-
-#### Build-time variables
-- **VERSION** : version of Piwik
-- **GPG_matthieu** : fingerprint of signing key
-
-#### Environment variables
-- **GID** : piwik group id *(default : 991)*
-- **UID** : piwik user id *(default : 991)*
-
-#### Volumes
-- **/config** : configuration files
-
-#### Update
-Piwik can update itself. It works well. I'm also maintaing this Dockerfile, so if you don't want to do upgrades directly from Piwik, you can recreate the container as well whenever I push an update.
-
-#### Configuration
-According to Piwik, everything should be fine running this image. You shoudn't have any difficulties to setup your own instance of Piwik. Your `/config/config.ini.php` overwrites the one (in `/piwik/config`)used by Piwik each time the container is started. Moreover, the old config.ini.php is saved as `/config/config.ini.php.bkp` if you want to revert last changes. This should also guarantee transparency through Piwik's updates.
-
-If you're running Piwik behind a reverse proxy (most likely you do), add this to your `config.ini.php` :
-
-```
-[General]
-#assume_secure_protocol = 1 #uncomment if you use https
-proxy_client_headers[] = HTTP_X_FORWARDED_FOR
-proxy_client_headers[] = HTTP_X_REAL_IP
-proxy_host_headers[] = HTTP_X_FORWARDED_HOST
-```
-
-#### Reverse proxy
-Use port **8888**.
-https://github.com/Wonderfall/dockerfiles/tree/master/reverse
-https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration
-
-#### Docker Compose (example)
-```
-piwik:
-  image: wonderfall/piwik
-  links:
-    - db_piwik:db_piwik
-  volumes:
-    - /mnt/docker/piwik/config:/config
-  environment:
-    - GID=1000
-    - UID=1000
-
-db_piwik:
-  image: mariadb:10
-  volumes:
-    - /mnt/docker/piwik/db:/var/lib/mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=asupersecretpassword
-    - MYSQL_DATABASE=piwik
-    - MYSQL_USER=piwik
-    - MYSQL_PASSWORD=asupersecretpassword
-```
diff --git a/piwik/rootfs/nginx/sites-enabled/nginx.conf b/piwik/rootfs/nginx/sites-enabled/nginx.conf
deleted file mode 100644
index 69ea84de..00000000
--- a/piwik/rootfs/nginx/sites-enabled/nginx.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-server {
-        listen 8888;
-        root /piwik;
-        index index.php index.html;
-
-        location ~* \.(?:bat|git|ini|sh|svn[^.]*|txt|tpl|xml)$ {
-            return 404;
-        }
-
-        location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
-            expires 30d;
-            access_log off;
-	}
-
-        location = /favicon.ico {
-            try_files /favicon.ico =204;
-        }
-
-        location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ {
-            return 404;
-        }
-
-        location ~ ^/(vendor|config|tmp|libs|misc) {            
-            deny all;                                                 
-            return 404;                                                      
-        }                                                                    
-                                                                             
-        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {
-            deny all;                                                        
-        }                                                                    
-                                                                             
-        location ~ /\. {                                                     
-            deny all;                                                        
-        }
-
-        location / {
-            try_files $uri /index.php;
-        }
-
-	location ~ \.php$ {
-            fastcgi_index index.php;
-            fastcgi_pass unix:/php/run/php-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include /nginx/conf/fastcgi_params;
-	}
-}
diff --git a/piwik/rootfs/php/conf.d/opcache.ini b/piwik/rootfs/php/conf.d/opcache.ini
deleted file mode 100644
index d77112b7..00000000
--- a/piwik/rootfs/php/conf.d/opcache.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-zend_extension=opcache.so
-opcache.enable=1
-opcache.enable_cli=1
-opcache.fast_shutdown=1
-opcache.memory_consumption=<OPCACHE_MEM_SIZE>
-opcache.interned_strings_buffer=16
-opcache.max_accelerated_files=10000
-opcache.revalidate_freq=60
diff --git a/piwik/rootfs/usr/local/bin/run.sh b/piwik/rootfs/usr/local/bin/run.sh
deleted file mode 100644
index 887825e8..00000000
--- a/piwik/rootfs/usr/local/bin/run.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
-       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
-       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /php/conf.d/opcache.ini
-
-if [ ! -f /config/config.ini.php ]; then
-  cp /piwik/config/config.ini.php /config/config.ini.php
-fi
-
-ln -s /config/config.ini.php /piwik/config/config.ini.php
-mv piwik fix && mv fix piwik # fix strange bug
-chown -R $UID:$GID /piwik /config /var/log /php /nginx /tmp /usr/share/GeoIP /etc/s6.d
-exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/libresonic/Dockerfile b/unmaintained/libresonic/Dockerfile
similarity index 100%
rename from libresonic/Dockerfile
rename to unmaintained/libresonic/Dockerfile
diff --git a/libresonic/README.md b/unmaintained/libresonic/README.md
similarity index 100%
rename from libresonic/README.md
rename to unmaintained/libresonic/README.md
diff --git a/libresonic/run.sh b/unmaintained/libresonic/run.sh
similarity index 100%
rename from libresonic/run.sh
rename to unmaintained/libresonic/run.sh
diff --git a/lychee/Dockerfile b/unmaintained/lychee/Dockerfile
similarity index 100%
rename from lychee/Dockerfile
rename to unmaintained/lychee/Dockerfile
diff --git a/lychee/README.md b/unmaintained/lychee/README.md
similarity index 100%
rename from lychee/README.md
rename to unmaintained/lychee/README.md
diff --git a/lychee/nginx.conf b/unmaintained/lychee/nginx.conf
similarity index 100%
rename from lychee/nginx.conf
rename to unmaintained/lychee/nginx.conf
diff --git a/lychee/php-fpm.conf b/unmaintained/lychee/php-fpm.conf
similarity index 100%
rename from lychee/php-fpm.conf
rename to unmaintained/lychee/php-fpm.conf
diff --git a/lychee/run.sh b/unmaintained/lychee/run.sh
similarity index 100%
rename from lychee/run.sh
rename to unmaintained/lychee/run.sh
diff --git a/lychee/s6.d/.s6-svscan/finish b/unmaintained/lychee/s6.d/.s6-svscan/finish
similarity index 100%
rename from lychee/s6.d/.s6-svscan/finish
rename to unmaintained/lychee/s6.d/.s6-svscan/finish
diff --git a/lychee/s6.d/nginx/run b/unmaintained/lychee/s6.d/nginx/run
similarity index 100%
rename from lychee/s6.d/nginx/run
rename to unmaintained/lychee/s6.d/nginx/run
diff --git a/lychee/s6.d/php/run b/unmaintained/lychee/s6.d/php/run
similarity index 100%
rename from lychee/s6.d/php/run
rename to unmaintained/lychee/s6.d/php/run
diff --git a/mastodon/Dockerfile.master b/unmaintained/mastodon/Dockerfile.master
similarity index 100%
rename from mastodon/Dockerfile.master
rename to unmaintained/mastodon/Dockerfile.master
diff --git a/mastodon/Dockerfile.stable b/unmaintained/mastodon/Dockerfile.stable
similarity index 100%
rename from mastodon/Dockerfile.stable
rename to unmaintained/mastodon/Dockerfile.stable
diff --git a/mastodon/Dockerfile.targaryen b/unmaintained/mastodon/Dockerfile.targaryen
similarity index 100%
rename from mastodon/Dockerfile.targaryen
rename to unmaintained/mastodon/Dockerfile.targaryen
diff --git a/mastodon/README.md b/unmaintained/mastodon/README.md
similarity index 100%
rename from mastodon/README.md
rename to unmaintained/mastodon/README.md
diff --git a/mastodon/rootfs/etc/s6.d/.s6-svscan/finish b/unmaintained/mastodon/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from mastodon/rootfs/etc/s6.d/.s6-svscan/finish
rename to unmaintained/mastodon/rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/mastodon/rootfs/etc/s6.d/sidekiq/run b/unmaintained/mastodon/rootfs/etc/s6.d/sidekiq/run
similarity index 100%
rename from mastodon/rootfs/etc/s6.d/sidekiq/run
rename to unmaintained/mastodon/rootfs/etc/s6.d/sidekiq/run
diff --git a/mastodon/rootfs/etc/s6.d/streaming/run b/unmaintained/mastodon/rootfs/etc/s6.d/streaming/run
similarity index 100%
rename from mastodon/rootfs/etc/s6.d/streaming/run
rename to unmaintained/mastodon/rootfs/etc/s6.d/streaming/run
diff --git a/mastodon/rootfs/etc/s6.d/web/run b/unmaintained/mastodon/rootfs/etc/s6.d/web/run
similarity index 100%
rename from mastodon/rootfs/etc/s6.d/web/run
rename to unmaintained/mastodon/rootfs/etc/s6.d/web/run
diff --git a/mastodon/rootfs/usr/local/bin/run b/unmaintained/mastodon/rootfs/usr/local/bin/run
similarity index 100%
rename from mastodon/rootfs/usr/local/bin/run
rename to unmaintained/mastodon/rootfs/usr/local/bin/run
diff --git a/mastodon/targaryen/app/javascript/images/elephant-friend.png b/unmaintained/mastodon/targaryen/app/javascript/images/elephant-friend.png
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/elephant-friend.png
rename to unmaintained/mastodon/targaryen/app/javascript/images/elephant-friend.png
diff --git a/mastodon/targaryen/app/javascript/images/logo.svg b/unmaintained/mastodon/targaryen/app/javascript/images/logo.svg
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/logo.svg
rename to unmaintained/mastodon/targaryen/app/javascript/images/logo.svg
diff --git a/mastodon/targaryen/app/javascript/images/logo_alt.svg b/unmaintained/mastodon/targaryen/app/javascript/images/logo_alt.svg
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/logo_alt.svg
rename to unmaintained/mastodon/targaryen/app/javascript/images/logo_alt.svg
diff --git a/mastodon/targaryen/app/javascript/images/logo_full.svg b/unmaintained/mastodon/targaryen/app/javascript/images/logo_full.svg
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/logo_full.svg
rename to unmaintained/mastodon/targaryen/app/javascript/images/logo_full.svg
diff --git a/mastodon/targaryen/app/javascript/images/mastodon-getting-started.png b/unmaintained/mastodon/targaryen/app/javascript/images/mastodon-getting-started.png
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/mastodon-getting-started.png
rename to unmaintained/mastodon/targaryen/app/javascript/images/mastodon-getting-started.png
diff --git a/mastodon/targaryen/app/javascript/images/mastodon-not-found.png b/unmaintained/mastodon/targaryen/app/javascript/images/mastodon-not-found.png
similarity index 100%
rename from mastodon/targaryen/app/javascript/images/mastodon-not-found.png
rename to unmaintained/mastodon/targaryen/app/javascript/images/mastodon-not-found.png
diff --git a/mastodon/targaryen/app/javascript/styles/variables.scss b/unmaintained/mastodon/targaryen/app/javascript/styles/variables.scss
similarity index 100%
rename from mastodon/targaryen/app/javascript/styles/variables.scss
rename to unmaintained/mastodon/targaryen/app/javascript/styles/variables.scss
diff --git a/mastodon/targaryen/public/android-chrome-192x192.png b/unmaintained/mastodon/targaryen/public/android-chrome-192x192.png
similarity index 100%
rename from mastodon/targaryen/public/android-chrome-192x192.png
rename to unmaintained/mastodon/targaryen/public/android-chrome-192x192.png
diff --git a/mastodon/targaryen/public/apple-touch-icon.png b/unmaintained/mastodon/targaryen/public/apple-touch-icon.png
similarity index 100%
rename from mastodon/targaryen/public/apple-touch-icon.png
rename to unmaintained/mastodon/targaryen/public/apple-touch-icon.png
diff --git a/mastodon/targaryen/public/avatars/original/missing.png b/unmaintained/mastodon/targaryen/public/avatars/original/missing.png
similarity index 100%
rename from mastodon/targaryen/public/avatars/original/missing.png
rename to unmaintained/mastodon/targaryen/public/avatars/original/missing.png
diff --git a/mastodon/targaryen/public/favicon.ico b/unmaintained/mastodon/targaryen/public/favicon.ico
similarity index 100%
rename from mastodon/targaryen/public/favicon.ico
rename to unmaintained/mastodon/targaryen/public/favicon.ico
diff --git a/mastodon/targaryen/public/mstile-150x150.png b/unmaintained/mastodon/targaryen/public/mstile-150x150.png
similarity index 100%
rename from mastodon/targaryen/public/mstile-150x150.png
rename to unmaintained/mastodon/targaryen/public/mstile-150x150.png
diff --git a/mastodon/targaryen/public/oops.png b/unmaintained/mastodon/targaryen/public/oops.png
similarity index 100%
rename from mastodon/targaryen/public/oops.png
rename to unmaintained/mastodon/targaryen/public/oops.png
diff --git a/mastodon/targaryen/targaryen.sh b/unmaintained/mastodon/targaryen/targaryen.sh
similarity index 100%
rename from mastodon/targaryen/targaryen.sh
rename to unmaintained/mastodon/targaryen/targaryen.sh
diff --git a/rtorrent-flood/Dockerfile b/unmaintained/rtorrent-flood/Dockerfile
similarity index 100%
rename from rtorrent-flood/Dockerfile
rename to unmaintained/rtorrent-flood/Dockerfile
diff --git a/rtorrent-flood/README.md b/unmaintained/rtorrent-flood/README.md
similarity index 100%
rename from rtorrent-flood/README.md
rename to unmaintained/rtorrent-flood/README.md
diff --git a/rtorrent-flood/config.js b/unmaintained/rtorrent-flood/config.js
similarity index 100%
rename from rtorrent-flood/config.js
rename to unmaintained/rtorrent-flood/config.js
diff --git a/rtorrent-flood/postdl b/unmaintained/rtorrent-flood/postdl
similarity index 100%
rename from rtorrent-flood/postdl
rename to unmaintained/rtorrent-flood/postdl
diff --git a/rtorrent-flood/postrm b/unmaintained/rtorrent-flood/postrm
similarity index 100%
rename from rtorrent-flood/postrm
rename to unmaintained/rtorrent-flood/postrm
diff --git a/rtorrent-flood/rtorrent.rc b/unmaintained/rtorrent-flood/rtorrent.rc
similarity index 100%
rename from rtorrent-flood/rtorrent.rc
rename to unmaintained/rtorrent-flood/rtorrent.rc
diff --git a/rtorrent-flood/run.sh b/unmaintained/rtorrent-flood/run.sh
similarity index 100%
rename from rtorrent-flood/run.sh
rename to unmaintained/rtorrent-flood/run.sh
diff --git a/rtorrent-flood/s6.d/.s6-svscan/finish b/unmaintained/rtorrent-flood/s6.d/.s6-svscan/finish
similarity index 100%
rename from rtorrent-flood/s6.d/.s6-svscan/finish
rename to unmaintained/rtorrent-flood/s6.d/.s6-svscan/finish
diff --git a/rtorrent-flood/s6.d/flood/run b/unmaintained/rtorrent-flood/s6.d/flood/run
similarity index 100%
rename from rtorrent-flood/s6.d/flood/run
rename to unmaintained/rtorrent-flood/s6.d/flood/run
diff --git a/rtorrent-flood/s6.d/rtorrent/run b/unmaintained/rtorrent-flood/s6.d/rtorrent/run
similarity index 100%
rename from rtorrent-flood/s6.d/rtorrent/run
rename to unmaintained/rtorrent-flood/s6.d/rtorrent/run

From f02fafd92987ca7480a5e19cc4b0f2788b07b0de Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Mon, 22 Jan 2018 22:31:32 +0100
Subject: [PATCH 044/328] [piwik -> matamo] rename piwik to matamo and update.

---
 matomo/Dockerfile                            | 57 ++++++++++++++++
 matomo/README.md                             | 69 ++++++++++++++++++++
 matomo/rootfs/nginx/sites-enabled/nginx.conf | 46 +++++++++++++
 matomo/rootfs/php/conf.d/opcache.ini         |  8 +++
 matomo/rootfs/usr/local/bin/run.sh           | 13 ++++
 5 files changed, 193 insertions(+)
 create mode 100644 matomo/Dockerfile
 create mode 100644 matomo/README.md
 create mode 100644 matomo/rootfs/nginx/sites-enabled/nginx.conf
 create mode 100644 matomo/rootfs/php/conf.d/opcache.ini
 create mode 100644 matomo/rootfs/usr/local/bin/run.sh

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
new file mode 100644
index 00000000..717f0b71
--- /dev/null
+++ b/matomo/Dockerfile
@@ -0,0 +1,57 @@
+FROM hoellen/nginx-php:7.1
+
+ARG VERSION=3.3.0
+ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
+
+ENV UID=991 GID=991 \
+    UPLOAD_MAX_SIZE=10M \
+    MEMORY_LIMIT=256M \
+    OPCACHE_MEM_SIZE=128M
+
+RUN BUILD_DEPS=" \
+    git \
+    tar \
+    build-base \
+    autoconf \
+    geoip-dev \
+    libressl \
+    ca-certificates \
+    gnupg" \
+ && apk -U upgrade && apk add \
+    ${BUILD_DEPS} \
+    geoip \
+    tzdata \
+ && pecl install geoip-1.1.1 \
+ && echo 'extension=geoip.so' >> /php/conf.d/geoip.ini \
+ && mkdir /matomo && cd /tmp \
+ && MATOMO_TARBALL="piwik-${VERSION}.tar.gz" \
+ && wget -q https://builds.matomo.org/${MATOMO_TARBALL} \
+ && wget -q https://builds.matomo.org/${MATOMO_TARBALL}.asc \
+ && wget -q https://builds.matomo.org/signature.asc \
+ && echo "Verifying authenticity of ${MATOMO_TARBALL}..." \
+ && gpg --import signature.asc \
+ && FINGERPRINT="$(LANG=C gpg --verify ${MATOMO_TARBALL}.asc ${MATOMO_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_matthieu}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
+ && echo "All seems good, now unpacking ${MATOMO_TARBALL}..." \
+ && tar xzf ${MATOMO_TARBALL} --strip 1 -C /matomo \
+ && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /usr/share/GeoIP/ \
+ && gzip -d /usr/share/GeoIP/GeoLiteCity.dat.gz \
+ && mv /usr/share/GeoIP/GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat \
+ && apk del ${BUILD_DEPS} php7-dev php7-pear \
+ && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
+
+COPY rootfs /
+
+RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+
+VOLUME /config
+
+EXPOSE 8888
+
+LABEL description "Open web analytics platform" \
+      matomo "Matomo v${VERSION}" \
+      maintainer="hoellen <indo@hoellen.eu>"
+
+CMD ["run.sh"]
diff --git a/matomo/README.md b/matomo/README.md
new file mode 100644
index 00000000..736ce392
--- /dev/null
+++ b/matomo/README.md
@@ -0,0 +1,69 @@
+## hoellen/matomo
+
+![](https://i.goopics.net/m3.png)
+
+#### What is this?
+It is a web analytics platform. Matomo respects your privacy and gives you full control over your data.
+
+#### Features
+- Based on wonderfall/dockerfiles (Thanks!)
+- Based on Alpine Linux.
+- Latest Matomo stable.
+- nginx stable + PHP7.
+- mysql drivers (server not built-in).
+- Latest GeoLite City Database from maxmind.com.
+
+#### Build-time variables
+- **VERSION** : version of Matomo
+- **GPG_matthieu** : fingerprint of signing key
+
+#### Environment variables
+- **GID** : matomo group id *(default : 991)*
+- **UID** : matomo user id *(default : 991)*
+
+#### Volumes
+- **/config** : configuration files
+
+#### Update
+Matomo can update itself. It works well. I'm also maintaing this Dockerfile, so if you don't want to do upgrades directly from Matomo, you can recreate the container as well whenever I push an update.
+
+#### Configuration
+According to Matomo, everything should be fine running this image. You shoudn't have any difficulties to setup your own instance of Matomo. Your `/config/config.ini.php` overwrites the one (in `/matomo/config`)used by Matomo each time the container is started. Moreover, the old config.ini.php is saved as `/config/config.ini.php.bkp` if you want to revert last changes. This should also guarantee transparency through Matomo's updates.
+
+If you're running Matomo behind a reverse proxy (most likely you do), add this to your `config.ini.php` :
+
+```
+[General]
+#assume_secure_protocol = 1 #uncomment if you use https
+proxy_client_headers[] = HTTP_X_FORWARDED_FOR
+proxy_client_headers[] = HTTP_X_REAL_IP
+proxy_host_headers[] = HTTP_X_FORWARDED_HOST
+```
+
+#### Reverse proxy
+Use port **8888**.
+https://github.com/Wonderfall/dockerfiles/tree/master/reverse
+https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration
+
+#### Docker Compose (example)
+```
+matomo:
+  image: hoellen/matomo
+  links:
+    - db_matomo:db_matomo
+  volumes:
+    - /mnt/docker/matomo/config:/config
+  environment:
+    - GID=1000
+    - UID=1000
+
+db_matomo:
+  image: mariadb:10
+  volumes:
+    - /mnt/docker/matomo/db:/var/lib/mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=asupersecretpassword
+    - MYSQL_DATABASE=matomo
+    - MYSQL_USER=matomo
+    - MYSQL_PASSWORD=asupersecretpassword
+```
diff --git a/matomo/rootfs/nginx/sites-enabled/nginx.conf b/matomo/rootfs/nginx/sites-enabled/nginx.conf
new file mode 100644
index 00000000..140c30cc
--- /dev/null
+++ b/matomo/rootfs/nginx/sites-enabled/nginx.conf
@@ -0,0 +1,46 @@
+server {
+        listen 8888;
+        root /matomo;
+        index index.php index.html;
+
+        location ~* \.(?:bat|git|ini|sh|svn[^.]*|txt|tpl|xml)$ {
+            return 404;
+        }
+
+        location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
+            expires 30d;
+            access_log off;
+	}
+
+        location = /favicon.ico {
+            try_files /favicon.ico =204;
+        }
+
+        location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ {
+            return 404;
+        }
+
+        location ~ ^/(vendor|config|tmp|libs|misc) {
+            deny all;
+            return 404;
+        }
+
+        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {
+            deny all;
+        }
+
+        location ~ /\. {
+            deny all;
+        }
+
+        location / {
+            try_files $uri /index.php;
+        }
+
+	location ~ \.php$ {
+            fastcgi_index index.php;
+            fastcgi_pass unix:/php/run/php-fpm.sock;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /nginx/conf/fastcgi_params;
+	}
+}
diff --git a/matomo/rootfs/php/conf.d/opcache.ini b/matomo/rootfs/php/conf.d/opcache.ini
new file mode 100644
index 00000000..d77112b7
--- /dev/null
+++ b/matomo/rootfs/php/conf.d/opcache.ini
@@ -0,0 +1,8 @@
+zend_extension=opcache.so
+opcache.enable=1
+opcache.enable_cli=1
+opcache.fast_shutdown=1
+opcache.memory_consumption=<OPCACHE_MEM_SIZE>
+opcache.interned_strings_buffer=16
+opcache.max_accelerated_files=10000
+opcache.revalidate_freq=60
diff --git a/matomo/rootfs/usr/local/bin/run.sh b/matomo/rootfs/usr/local/bin/run.sh
new file mode 100644
index 00000000..c49e1f64
--- /dev/null
+++ b/matomo/rootfs/usr/local/bin/run.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
+       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /php/conf.d/opcache.ini
+
+if [ ! -f /config/config.ini.php ]; then
+  cp /matomo/config/config.ini.php /config/config.ini.php
+fi
+
+ln -s /config/config.ini.php /matomo/config/config.ini.php
+mv matomo fix && mv fix matomo # fix strange bug
+chown -R $UID:$GID /matomo /config /var/log /php /nginx /tmp /usr/share/GeoIP /etc/s6.d
+exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

From c67625a94d84b92510f910695608d7d72411bdc6 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Mon, 22 Jan 2018 22:48:45 +0100
Subject: [PATCH 045/328] [matomo] update README

---
 matomo/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/matomo/README.md b/matomo/README.md
index 736ce392..e1f3bc74 100644
--- a/matomo/README.md
+++ b/matomo/README.md
@@ -1,7 +1,5 @@
 ## hoellen/matomo
 
-![](https://i.goopics.net/m3.png)
-
 #### What is this?
 It is a web analytics platform. Matomo respects your privacy and gives you full control over your data.
 

From fcbb248f15154c54d56bd67c4ce6ff29c05055e9 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Wed, 24 Jan 2018 12:26:34 +0100
Subject: [PATCH 046/328] [matomo] fix typo

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 717f0b71..31cd47a5 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -52,6 +52,6 @@ EXPOSE 8888
 
 LABEL description "Open web analytics platform" \
       matomo "Matomo v${VERSION}" \
-      maintainer="hoellen <indo@hoellen.eu>"
+      maintainer="hoellen <info@hoellen.eu>"
 
 CMD ["run.sh"]

From c49fdfdd354567b9b34d27d8820b3ccdf5be8d88 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Wed, 24 Jan 2018 12:27:52 +0100
Subject: [PATCH 047/328] readme.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fff8385c..18e15e6f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # dockerfiles
 Based on [Wonderfall Dockerfiles](https://github.com/Wonderfall/dockerfiles)
 
-There are for some services **automated builds** on [Docker](https://hub.docker.com/u/hoellen).
+There are **automated builds** on [Docker](https://hub.docker.com/u/hoellen).

From 2b8e12603d0285a6be2806c0ce9a7f509bcfbfe1 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Wed, 24 Jan 2018 12:30:39 +0100
Subject: [PATCH 048/328] [nextcloud] update 11.0.7 and 12.0.5

---
 nextcloud/Dockerfile.11.0 | 2 +-
 nextcloud/Dockerfile.12.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.11.0 b/nextcloud/Dockerfile.11.0
index 4348d84e..4bbfbd8c 100644
--- a/nextcloud/Dockerfile.11.0
+++ b/nextcloud/Dockerfile.11.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=11.0.4
+ARG NEXTCLOUD_VERSION=11.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index e5462c70..3728546b 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.4
+ARG NEXTCLOUD_VERSION=12.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From d2439a8f3389649b275e1e4ad661cbb648c94147 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Sat, 27 Jan 2018 20:24:31 +0100
Subject: [PATCH 049/328] [nextcloud] update to 13 RC3

---
 nextcloud/Dockerfile.13.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index acaa92e7..404368e3 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.0RC2
+ARG NEXTCLOUD_VERSION=13.0.0RC3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From bb59c093d4283d28786a30346dff9c66b9971f3a Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Wed, 31 Jan 2018 21:52:26 +0100
Subject: [PATCH 050/328] [nextcloud] update to 13.0 RC4

---
 nextcloud/Dockerfile.13.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 404368e3..0092b231 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.0RC3
+ARG NEXTCLOUD_VERSION=13.0.0RC4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From f7e554933e2be1f8d66ab87c6a41915ef430f957 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 1 Feb 2018 13:52:18 +0100
Subject: [PATCH 051/328] [nginx-php] update to 7.2.2

---
 nginx-php/Dockerfile.7.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index d64a63f2..84ae0f89 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.8
-ARG PHP_VER=7.2.1
+ARG PHP_VER=7.2.2
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 9baa09176e5cf24e3af52453b797bae6c6f7d061 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 1 Feb 2018 17:51:10 +0100
Subject: [PATCH 052/328] [nginx-php] update to 7.1.14

---
 nginx-php/Dockerfile.7.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 86e5ea5a..7709ec9b 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.8
-ARG PHP_VER=7.1.13
+ARG PHP_VER=7.1.14
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From d80a592503b80842c5c77db52323b39f65e82049 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 6 Feb 2018 10:39:01 +0100
Subject: [PATCH 053/328] [nextcloud] update to 13.0

---
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/README.md       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 0092b231..bb1451df 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.0RC4
+ARG NEXTCLOUD_VERSION=13.0.0
 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 f1244e59..7b3af3c3 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -23,10 +23,10 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version. (12.0)
-- **13.0** : latest 13.0.x version (beta)
-- **12.0** : latest 12.0.x version (stable)
-- **11.0** : latest 11.0.x version (old stable)
+- **latest** : latest stable version. (13.0)
+- **13.0** : latest 13.0.x version (stable)
+- **12.0** : latest 12.0.x version (old stable)
+- **11.0** : latest 11.0.x version (deprecated)
 - **daily** : latest code (daily build).
 
 Other tags than `daily` are built weekly. For security reasons, you should occasionally update the container, even if you have the latest version of Nextcloud.

From e6b940d169e50299c4d73645fa4c560c90ef147b Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 7 Feb 2018 22:18:15 +0100
Subject: [PATCH 054/328] [nextcloud] fix Dockerfile.13.0

---
 nextcloud/Dockerfile.13.0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index bb1451df..aa112af4 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -38,9 +38,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From c576d95a54b0fd311f2695e1dc64aa6522c51ab0 Mon Sep 17 00:00:00 2001
From: stffabi <stffabi@users.noreply.github.com>
Date: Wed, 14 Feb 2018 11:34:15 +0100
Subject: [PATCH 055/328] Remove invalid image url and wrong build information

---
 nginx-php/README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nginx-php/README.md b/nginx-php/README.md
index 7eaac267..ee82c262 100644
--- a/nginx-php/README.md
+++ b/nginx-php/README.md
@@ -1,8 +1,3 @@
-![nginx-php](http://apmblog.dynatrace.com/wp-content/uploads/2014/10/PHP-on-Nginx.jpg)
-
-> This image is build and push with [drone.io](https://github.com/drone/drone), a circle-ci like self-hosted.
-> If you don't trust, you can build yourself.
-
 ## Description
 What is [Nginx](http://nginx.org)?
 

From 505813c045f0d8fde2c047ba175aec5d83c0d32b Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 19 Feb 2018 09:01:07 +0100
Subject: [PATCH 056/328] [searx] update to 0.14.0

---
 searx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index d0070480..9c255eaf 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7
 
-ARG VERSION=0.13.1
+ARG VERSION=0.14.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991

From 69f894b4d32fa4e590f8ddb22f4b4fdea38c03f6 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Wed, 21 Feb 2018 16:39:27 +0100
Subject: [PATCH 057/328] update nginx to 1.13.9

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index d60bd02e..5fff6379 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.8
+ARG NGINX_VERSION=1.13.9
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 7709ec9b..08662a9d 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.8
+ARG NGINX_VER=1.13.9
 ARG PHP_VER=7.1.14
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 84ae0f89..6639c164 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.8
+ARG NGINX_VER=1.13.9
 ARG PHP_VER=7.2.2
 ARG LIBICONV_VERSION=1.15
 

From 7c854f7e9cdf6a8d900801a034fe10785042492a Mon Sep 17 00:00:00 2001
From: rokube <rokube@git>
Date: Thu, 1 Mar 2018 09:47:39 +0100
Subject: [PATCH 058/328] Added Referrer-Policy HTTP Security Header for
 Nextcloud Nginx.

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 2fb15491..b9744c81 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -10,6 +10,7 @@ server {
         add_header X-Robots-Tag none;
         add_header X-Download-Options noopen;
         add_header X-Permitted-Cross-Domain-Policies none;
+        add_header Referrer-Policy "same-origin";
 
         location = /robots.txt {
             allow all;

From e27438d4da7112a3f5ed236e5a4aee9a661e2f8e Mon Sep 17 00:00:00 2001
From: stffabi <stffabi@users.noreply.github.com>
Date: Fri, 2 Mar 2018 01:49:11 +0100
Subject: [PATCH 059/328] [nginx-php] update php to 7.2.3

---
 nginx-php/Dockerfile.7.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 6639c164..00e1c62f 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.9
-ARG PHP_VER=7.2.2
+ARG PHP_VER=7.2.3
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 0d23dee1df7a29a269ca5e3d21b9a46e9e9b4958 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 2 Mar 2018 08:21:35 +0100
Subject: [PATCH 060/328] [nginx-php] update to 7.1.15

---
 nginx-php/Dockerfile.7.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 08662a9d..1a42afa3 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.9
-ARG PHP_VER=7.1.14
+ARG PHP_VER=7.1.15
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 11880ea8edcd440127531f8b831e492761a21bcc Mon Sep 17 00:00:00 2001
From: Fabrizio Steiner <stffabi@users.noreply.github.com>
Date: Thu, 15 Mar 2018 10:49:29 +0100
Subject: [PATCH 061/328] [nextcloud] update 11.0.8, 12.0.6 and 13.0.1

---
 nextcloud/Dockerfile.11.0 | 2 +-
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.11.0 b/nextcloud/Dockerfile.11.0
index 4bbfbd8c..fcda8826 100644
--- a/nextcloud/Dockerfile.11.0
+++ b/nextcloud/Dockerfile.11.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=11.0.7
+ARG NEXTCLOUD_VERSION=11.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 3728546b..c4d64e60 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.5
+ARG NEXTCLOUD_VERSION=12.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index aa112af4..0073ed3c 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.0
+ARG NEXTCLOUD_VERSION=13.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 3e1f1c6cd7d7d6bb1efc14cf8a916716161bda88 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 15 Mar 2018 10:55:27 +0100
Subject: [PATCH 062/328] [nextcloud] Correct ownership of symlinks

---
 nextcloud/rootfs/usr/local/bin/run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nextcloud/rootfs/usr/local/bin/run.sh b/nextcloud/rootfs/usr/local/bin/run.sh
index b0e632f8..673c1213 100644
--- a/nextcloud/rootfs/usr/local/bin/run.sh
+++ b/nextcloud/rootfs/usr/local/bin/run.sh
@@ -11,6 +11,7 @@ sed -i -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /php/conf.d/apcu.ini \
 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
+chown -h $UID:$GID /nextcloud/config/config.php /nextcloud/apps2
 
 # Create folder for php sessions if not exists
 if [ ! -d /data/session ]; then

From e202b027d5f6f40529258d919e100f3b8c7732a0 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 20 Mar 2018 19:01:55 +0100
Subject: [PATCH 063/328] [matomo] fix readme

---
 matomo/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/matomo/README.md b/matomo/README.md
index e1f3bc74..05367861 100644
--- a/matomo/README.md
+++ b/matomo/README.md
@@ -40,8 +40,7 @@ proxy_host_headers[] = HTTP_X_FORWARDED_HOST
 
 #### Reverse proxy
 Use port **8888**.
-https://github.com/Wonderfall/dockerfiles/tree/master/reverse
-https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration
+https://github.com/hoellen/dockerfiles/tree/master/boring-nginx
 
 #### Docker Compose (example)
 ```

From 60ad3ec520835388cdcd99ec9ddcf5cfc8cc1830 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 20 Mar 2018 19:07:23 +0100
Subject: [PATCH 064/328] [nginx-php][boring-nginx] update to 1.13.10 and
 increase proxy timeout

---
 boring-nginx/Dockerfile                         | 2 +-
 boring-nginx/rootfs/etc/nginx/conf/proxy_params | 5 +++++
 nginx-php/Dockerfile.7.1                        | 2 +-
 nginx-php/Dockerfile.7.2                        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 5fff6379..839dfd85 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.9
+ARG NGINX_VERSION=1.13.10
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/boring-nginx/rootfs/etc/nginx/conf/proxy_params b/boring-nginx/rootfs/etc/nginx/conf/proxy_params
index 6f9827e8..bbc4e4b3 100644
--- a/boring-nginx/rootfs/etc/nginx/conf/proxy_params
+++ b/boring-nginx/rootfs/etc/nginx/conf/proxy_params
@@ -4,3 +4,8 @@ proxy_set_header        X-Forwarded-For      $proxy_add_x_forwarded_for;
 proxy_set_header        X-Remote-Port        $remote_port;
 proxy_set_header        X-Forwarded-Proto    $scheme;
 proxy_redirect          off;
+
+proxy_connect_timeout       1400;
+proxy_send_timeout          1400;
+proxy_read_timeout          1400;
+send_timeout                1400;
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 1a42afa3..731a54ce 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.9
+ARG NGINX_VER=1.13.10
 ARG PHP_VER=7.1.15
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 00e1c62f..fc1541ef 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.9
+ARG NGINX_VER=1.13.10
 ARG PHP_VER=7.2.3
 ARG LIBICONV_VERSION=1.15
 

From f78961b2cb28b68f004503d657a53be2b058ab13 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Wed, 28 Mar 2018 09:46:45 +0200
Subject: [PATCH 065/328] [matomo] update to 3.4.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 31cd47a5..d8b97190 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG VERSION=3.3.0
+ARG VERSION=3.4.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From b26dc972b275c6a86265d51ed32871cc39c22c3b Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 29 Mar 2018 12:07:36 +0200
Subject: [PATCH 066/328] [nginx-php] update to 7.1.16 and 7.2.4

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 731a54ce..a2e95605 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.10
-ARG PHP_VER=7.1.15
+ARG PHP_VER=7.1.16
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index fc1541ef..8285b10b 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.10
-ARG PHP_VER=7.2.3
+ARG PHP_VER=7.2.4
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 90d0dcd0b0886c1324d49ca9e21c309bee7796b2 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 29 Mar 2018 12:10:22 +0200
Subject: [PATCH 067/328] [matomo] use php 7.2.x instead of 7.1.x

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index d8b97190..a9af51ff 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.1
+FROM hoellen/nginx-php:7.2
 
 ARG VERSION=3.4.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"

From f3bbdf2e6d003eb6504b8c4bed72c637c42cea93 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 3 Apr 2018 18:04:19 +0200
Subject: [PATCH 068/328] [nginx-php][boring-nginx] update nginx to 1.13.11

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 839dfd85..e7426d50 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.10
+ARG NGINX_VERSION=1.13.11
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index a2e95605..b601c57f 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.10
+ARG NGINX_VER=1.13.11
 ARG PHP_VER=7.1.16
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 8285b10b..87d40e38 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.10
+ARG NGINX_VER=1.13.11
 ARG PHP_VER=7.2.4
 ARG LIBICONV_VERSION=1.15
 

From 6fd18a0633dbea50673f72e1767d000c2c00a9fa Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 10 Apr 2018 17:41:15 +0200
Subject: [PATCH 069/328] [boring-nginx][nginx-php] update nginx to 1.13.12

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index e7426d50..19aa823b 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.11
+ARG NGINX_VERSION=1.13.12
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index b601c57f..851d34c8 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.11
+ARG NGINX_VER=1.13.12
 ARG PHP_VER=7.1.16
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 87d40e38..8ac7b58c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.11
+ARG NGINX_VER=1.13.12
 ARG PHP_VER=7.2.4
 ARG LIBICONV_VERSION=1.15
 

From 2196a24f96caa8da398c9c883f8a21a7080dc813 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 13 Apr 2018 17:32:19 +0200
Subject: [PATCH 070/328] [boring-nginx] update Dockerfile

---
 boring-nginx/Dockerfile | 8 +++-----
 boring-nginx/README.md  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 19aa823b..a93c12ab 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -64,12 +64,10 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && cd /tmp && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \
  && git clone https://boringssl.googlesource.com/boringssl --depth=1 \
  && cd boringssl \
- && sed -i 's@out \([>=]\) TLS1_2_VERSION@out \1 TLS1_3_VERSION@' ssl/ssl_lib.cc \
  && sed -i 's@ssl->version[ ]*=[ ]*TLS1_2_VERSION@ssl->version = TLS1_3_VERSION@' ssl/s3_lib.cc \
- && sed -i 's@(SSL3_VERSION, TLS1_2_VERSION@(SSL3_VERSION, TLS1_3_VERSION@' ssl/ssl_test.cc \
- && sed -i 's@\$shaext[ ]*=[ ]*0;@\$shaext = 1;@' crypto/*/asm/*.pl \
- && sed -i 's@\$avx[ ]*=[ ]*[0|1];@\$avx = 2;@' crypto/*/asm/*.pl \
- && sed -i 's@\$addx[ ]*=[ ]*0;@\$addx = 1;@' crypto/*/asm/*.pl \
+ && sed -i 's@\$shaext[ ]*=[ ]*0;@\$shaext = 1;@' crypto/*/*/asm/*.pl \
+ && sed -i 's@\$avx[ ]*=[ ]*[0|1];@\$avx = 2;@' crypto/*/*/asm/*.pl \
+ && sed -i 's@\$addx[ ]*=[ ]*0;@\$addx = 1;@' crypto/*/*/asm/*.pl \
  && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. \
  && make -j ${NB_CORES} && cd .. \
  && mkdir -p .openssl/lib/ && cd .openssl && ln -s ../include && cd .. \
diff --git a/boring-nginx/README.md b/boring-nginx/README.md
index 369ebf92..0daa8317 100644
--- a/boring-nginx/README.md
+++ b/boring-nginx/README.md
@@ -9,7 +9,7 @@ This is nginx statically linked against BoringSSL, with embedded Brotli support.
 - Thanks to [Wonderfall](https://github.com/wonderfall/dockerfiles)
 - Based on Alpine Linux.
 - nginx built against **BoringSSL** with SSE/SHA, and AVX2 SIMD-instructions.
-- **TLS 1.3** patch : use of TLS 1.3 DRAFT is enforced (haven't found another way yet).
+- **TLS 1.3** enabled
 - Built using hardening gcc flags.
 - Dynamic TLS records patch (cloudflare).
 - TTP/2 (+NPN) support.

From 236df8b91052668401cd6355168f99a798975c44 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 13 Apr 2018 22:11:55 +0200
Subject: [PATCH 071/328] [boring-nginx] new tls1.3 patch

---
 boring-nginx/Dockerfile  |  3 +-
 boring-nginx/tls13.patch | 63 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 boring-nginx/tls13.patch

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index a93c12ab..1c7280d0 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -64,7 +64,8 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && cd /tmp && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \
  && git clone https://boringssl.googlesource.com/boringssl --depth=1 \
  && cd boringssl \
- && sed -i 's@ssl->version[ ]*=[ ]*TLS1_2_VERSION@ssl->version = TLS1_3_VERSION@' ssl/s3_lib.cc \
+ && wget https://gitlab.com/buik/boringssl/raw/boringssl-patch/Enable-TLS13-BoringSSL.patch -O tls13.patch \
+ && git apply tls13.patch \
  && sed -i 's@\$shaext[ ]*=[ ]*0;@\$shaext = 1;@' crypto/*/*/asm/*.pl \
  && sed -i 's@\$avx[ ]*=[ ]*[0|1];@\$avx = 2;@' crypto/*/*/asm/*.pl \
  && sed -i 's@\$addx[ ]*=[ ]*0;@\$addx = 1;@' crypto/*/*/asm/*.pl \
diff --git a/boring-nginx/tls13.patch b/boring-nginx/tls13.patch
new file mode 100644
index 00000000..cc0d728c
--- /dev/null
+++ b/boring-nginx/tls13.patch
@@ -0,0 +1,63 @@
+From cfc32a1e540e4f542egggd3008 Mon Sep 17 00:00:00 2001
+From: Buik / Bassie <bassie@buik.locale>
+Date: Tue, 09 Apr 2018 12:55:23 +0800
+
+Subject: [PATCH] Enable TLS 1.3 on BoringSSL
+
+Enable TLS 1.3 on BoringSSL.
+Tested on Nginx 1.13.11 with BoringSSL chromium-stable and BoringSSL master (git branch April 09 2018)
+
+--- 
+ s3_lib.cc       | 2 +-
+ ssl_test.cc     | 4 ++--
+ ssl_versions.cc | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ssl/s3_lib.cc b/ssl/s3_lib.cc
+index a3fc8d7..b28bbc8 100644
+--- a/ssl/s3_lib.cc
++++ b/ssl/s3_lib.cc
+@@ -201,7 +201,7 @@ bool ssl3_new(SSL *ssl) {
+   // TODO(davidben): Move this field into |s3|, have it store the normalized
+   // protocol version, and implement this pre-negotiation quirk in |SSL_version|
+   // at the API boundary rather than in internal state.
+-  ssl->version = TLS1_2_VERSION;
++  ssl->version = TLS1_3_VERSION;
+   return true;
+ }
+ 
+diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
+index 12f044c..cfc4af1 100644
+--- a/ssl/ssl_test.cc
++++ b/ssl/ssl_test.cc
+@@ -2607,7 +2607,7 @@ TEST(SSLTest, SetVersion) {
+ 
+   // Zero is the default version.
+   EXPECT_TRUE(SSL_CTX_set_max_proto_version(ctx.get(), 0));
+-  EXPECT_EQ(TLS1_2_VERSION, ctx->conf_max_version);
++  EXPECT_EQ(TLS1_3_VERSION, ctx->conf_max_version);
+   EXPECT_TRUE(SSL_CTX_set_min_proto_version(ctx.get(), 0));
+   EXPECT_EQ(TLS1_VERSION, ctx->conf_min_version);
+ 
+@@ -2640,7 +2640,7 @@ TEST(SSLTest, SetVersion) {
+   EXPECT_FALSE(SSL_CTX_set_min_proto_version(ctx.get(), 0x1234));
+ 
+   EXPECT_TRUE(SSL_CTX_set_max_proto_version(ctx.get(), 0));
+-  EXPECT_EQ(TLS1_2_VERSION, ctx->conf_max_version);
++  EXPECT_EQ(TLS1_3_VERSION, ctx->conf_max_version);
+   EXPECT_TRUE(SSL_CTX_set_min_proto_version(ctx.get(), 0));
+   EXPECT_EQ(TLS1_1_VERSION, ctx->conf_min_version);
+ }
+diff --git a/ssl/ssl_versions.cc b/ssl/ssl_versions.cc
+index 73ea26f..da10cb2 100644
+--- a/ssl/ssl_versions.cc
++++ b/ssl/ssl_versions.cc
+@@ -189,7 +189,7 @@ static bool set_max_version(const SSL_PROTOCOL_METHOD *method, uint16_t *out,
+                             uint16_t version) {
+   // Zero is interpreted as the default maximum version.
+   if (version == 0) {
+-    *out = TLS1_2_VERSION;
++    *out = TLS1_3_VERSION;
+     return true;
+   }
+ 

From 0eac74690101112fb4b5a74f2ea63726b1b47b96 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Wed, 25 Apr 2018 21:49:40 +0200
Subject: [PATCH 072/328] [nextcloud] update to 12.0.7, 13.0.2 and remove
 version 11.0 (end-of-life)

---
 nextcloud/Dockerfile.11.0 | 71 ---------------------------------------
 nextcloud/Dockerfile.12.0 |  2 +-
 nextcloud/Dockerfile.13.0 |  2 +-
 nextcloud/README.md       |  2 +-
 4 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.11.0

diff --git a/nextcloud/Dockerfile.11.0 b/nextcloud/Dockerfile.11.0
deleted file mode 100644
index fcda8826..00000000
--- a/nextcloud/Dockerfile.11.0
+++ /dev/null
@@ -1,71 +0,0 @@
-FROM hoellen/nginx-php:7.1
-
-ARG NEXTCLOUD_VERSION=11.0.8
-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 \
-    CRON_PERIOD=15m \
-    CRON_MEMORY_LIMIT=1g \
-    TZ=Etc/UTC \
-    DB_TYPE=sqlite3 \
-    DOMAIN=localhost
-
-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.12.0 b/nextcloud/Dockerfile.12.0
index c4d64e60..46d37bc4 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.6
+ARG NEXTCLOUD_VERSION=12.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 0073ed3c..16060aa3 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.1
+ARG NEXTCLOUD_VERSION=13.0.2
 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 7b3af3c3..6a10501f 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -26,7 +26,7 @@
 - **latest** : latest stable version. (13.0)
 - **13.0** : latest 13.0.x version (stable)
 - **12.0** : latest 12.0.x version (old stable)
-- **11.0** : latest 11.0.x version (deprecated)
+- ~~**11.0** : latest 11.0.x version (end-of-life)~~
 - **daily** : latest code (daily build).
 
 Other tags than `daily` are built weekly. For security reasons, you should occasionally update the container, even if you have the latest version of Nextcloud.

From c0aac0d82fd8591640b068a1a812df0e16d31791 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 26 Apr 2018 11:47:24 +0200
Subject: [PATCH 073/328] [nginx-php] update php to 7.1.17 and 7.2.5

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 851d34c8..73101f13 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.12
-ARG PHP_VER=7.1.16
+ARG PHP_VER=7.1.17
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 8ac7b58c..8c1e7bc2 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.12
-ARG PHP_VER=7.2.4
+ARG PHP_VER=7.2.5
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From e93fa8ad3ed3230c7b6e04a2de7d9d960a653760 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 8 May 2018 14:41:31 +0200
Subject: [PATCH 074/328] [matomo] update to 3.5.0

---
 matomo/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index a9af51ff..7d983241 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.4.0
+ARG VERSION=3.5.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \
@@ -24,7 +24,7 @@ RUN BUILD_DEPS=" \
  && pecl install geoip-1.1.1 \
  && echo 'extension=geoip.so' >> /php/conf.d/geoip.ini \
  && mkdir /matomo && cd /tmp \
- && MATOMO_TARBALL="piwik-${VERSION}.tar.gz" \
+ && MATOMO_TARBALL="matomo-${VERSION}.tar.gz" \
  && wget -q https://builds.matomo.org/${MATOMO_TARBALL} \
  && wget -q https://builds.matomo.org/${MATOMO_TARBALL}.asc \
  && wget -q https://builds.matomo.org/signature.asc \

From 5fce08b7eb7cba33a11676e563a0a958459d1c8b Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 25 May 2018 12:40:26 +0200
Subject: [PATCH 075/328] [nginx-php] update php to 7.2.6 and 7.1.18

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 73101f13..01ea979a 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.12
-ARG PHP_VER=7.1.17
+ARG PHP_VER=7.1.18
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 8c1e7bc2..0756e98c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.12
-ARG PHP_VER=7.2.5
+ARG PHP_VER=7.2.6
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 2b1aa5224cfe78da4c016f2c934c34c9f480c99b Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 25 May 2018 12:52:40 +0200
Subject: [PATCH 076/328] [matomo] update to 3.5.1

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 7d983241..5e11f80c 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.5.0
+ARG VERSION=3.5.1
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 1a6bfd40390ada452805c4ec9cd1c34122944dc4 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 7 Jun 2018 11:01:19 +0200
Subject: [PATCH 077/328] [nginx-php][boring-nginx] update nginx to 1.15.0

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 1c7280d0..14daf3d0 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.13.12
+ARG NGINX_VERSION=1.15.0
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 01ea979a..9d94ec36 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.12
+ARG NGINX_VER=1.15.0
 ARG PHP_VER=7.1.18
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 0756e98c..380894d0 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.13.12
+ARG NGINX_VER=1.15.0
 ARG PHP_VER=7.2.6
 ARG LIBICONV_VERSION=1.15
 

From 75b811dac0cadfeb1fd8801b068562495383dec9 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 7 Jun 2018 11:46:47 +0200
Subject: [PATCH 078/328] add ability to set php-workers/servers/children

---
 matomo/Dockerfile                     | 6 +++++-
 matomo/rootfs/usr/local/bin/run.sh    | 6 +++++-
 nextcloud/Dockerfile.12.0             | 4 ++++
 nextcloud/Dockerfile.13.0             | 4 ++++
 nextcloud/Dockerfile.daily            | 4 ++++
 nextcloud/README.md                   | 4 ++++
 nextcloud/rootfs/usr/local/bin/run.sh | 6 +++++-
 nginx-php/rootfs/php/etc/php-fpm.conf | 8 ++++----
 privatebin/Dockerfile                 | 6 +++++-
 9 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 5e11f80c..8787def4 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -6,7 +6,11 @@ ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10M \
     MEMORY_LIMIT=256M \
-    OPCACHE_MEM_SIZE=128M
+    OPCACHE_MEM_SIZE=128M \
+    PHP_MAX_CHILDREN=15 \
+    PHP_START_SERVERS=2 \
+    PHP_MIN_SPARE_SERVERS=1 \
+    PHP_MAX_SPARE_SERVERS=6
 
 RUN BUILD_DEPS=" \
     git \
diff --git a/matomo/rootfs/usr/local/bin/run.sh b/matomo/rootfs/usr/local/bin/run.sh
index c49e1f64..d2c6a439 100644
--- a/matomo/rootfs/usr/local/bin/run.sh
+++ b/matomo/rootfs/usr/local/bin/run.sh
@@ -1,7 +1,11 @@
 #!/bin/sh
 sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
        -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
-       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /php/conf.d/opcache.ini
+       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /php/conf.d/opcache.ini \
+       -e "s/<PHP_MAX_CHILDREN>/$PHP_MAX_CHILDREN/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_START_SERVERS>/$PHP_START_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MIN_SPARE_SERVERS>/$PHP_MIN_SPARE_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MAX_SPARE_SERVERS>/$PHP_MAX_SPARE_SERVERS/g" /php/etc/php-fpm.conf
 
 if [ ! -f /config/config.ini.php ]; then
   cp /matomo/config/config.ini.php /config/config.ini.php
diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 46d37bc4..2da51fd7 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -8,6 +8,10 @@ ENV UID=991 GID=991 \
     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 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 16060aa3..e51b2c58 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -8,6 +8,10 @@ ENV UID=991 GID=991 \
     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 \
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 15dd0b01..550ca5ae 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -5,6 +5,10 @@ ENV UID=991 GID=991 \
     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 \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 6a10501f..63f042d2 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -43,6 +43,10 @@ Other tags than `daily` are built weekly. For security reasons, you should occas
 - **APC_SHM_SIZE** : apc memory size *(default : 128M)*
 - **OPCACHE_MEM_SIZE** : opcache memory size in megabytes *(default : 128)*
 - **MEMORY_LIMIT** : php memory limit *(default : 512M)*
+- **PHP_MAX_CHILDREN** : php max child processes *(default : 15)*
+- **PHP_START_SERVERS** : php number of processes on startup *(default : 2)*
+- **PHP_MIN_SPARE_SERVERS** : php min of idle processes *(default : 1)*
+- **PHP_MAX_SPARE_SERVERS** : php max of idle processes *(default : 6)*
 - **CRON_PERIOD** : time interval between two cron tasks *(default : 15m)*
 - **CRON_MEMORY_LIMIT** : memory limit for PHP when executing cronjobs *(default : 1024m)*
 - **TZ** : the system/log timezone *(default : Etc/UTC)*
diff --git a/nextcloud/rootfs/usr/local/bin/run.sh b/nextcloud/rootfs/usr/local/bin/run.sh
index 673c1213..6accca22 100644
--- a/nextcloud/rootfs/usr/local/bin/run.sh
+++ b/nextcloud/rootfs/usr/local/bin/run.sh
@@ -6,7 +6,11 @@ sed -i -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /php/conf.d/apcu.ini \
        -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run \
        -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /usr/local/bin/occ \
        -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
-       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MAX_CHILDREN>/$PHP_MAX_CHILDREN/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_START_SERVERS>/$PHP_START_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MIN_SPARE_SERVERS>/$PHP_MIN_SPARE_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MAX_SPARE_SERVERS>/$PHP_MAX_SPARE_SERVERS/g" /php/etc/php-fpm.conf
 
 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
diff --git a/nginx-php/rootfs/php/etc/php-fpm.conf b/nginx-php/rootfs/php/etc/php-fpm.conf
index 215e2640..4e68ce2b 100644
--- a/nginx-php/rootfs/php/etc/php-fpm.conf
+++ b/nginx-php/rootfs/php/etc/php-fpm.conf
@@ -5,10 +5,10 @@ error_log = /php/logs/error.log
 [www]
 listen = /php/run/php-fpm.sock
 pm = dynamic
-pm.max_children = 15
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 6
+pm.max_children = <PHP_MAX_CHILDREN>
+pm.start_servers = <PHP_START_SERVERS>
+pm.min_spare_servers = <PHP_MIN_SPARE_SERVERS>
+pm.max_spare_servers = <PHP_MAX_SPARE_SERVERS>
 chdir = /
 request_terminate_timeout = 0
 env[PATH] = /usr/local/bin:/usr/bin:/bin
diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index f0a92088..acccfb25 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -4,7 +4,11 @@ ARG PRIVATEBIN_VER=1.1.1
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \
-    MEMORY_LIMIT=128M
+    MEMORY_LIMIT=128M \
+    PHP_MAX_CHILDREN=15 \
+    PHP_START_SERVERS=2 \
+    PHP_MIN_SPARE_SERVERS=1 \
+    PHP_MAX_SPARE_SERVERS=6
 
 RUN BUILD_DEPS="tar libressl ca-certificates" \
  && apk -U upgrade && apk add $BUILD_DEPS \

From c2e5e87c61aec21c993d047fa1b50455fec604ec Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 7 Jun 2018 14:08:11 +0200
Subject: [PATCH 079/328] [nextcloud] update to 12.0.8 and 13.0.3

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 2da51fd7..0d222bbb 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.7
+ARG NEXTCLOUD_VERSION=12.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index e51b2c58..b56b0a77 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.2
+ARG NEXTCLOUD_VERSION=13.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From f8e8628d398cfeecf27d60448cf2f1babc155926 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 7 Jun 2018 15:20:37 +0200
Subject: [PATCH 080/328] [nextcloud] change PHP version from daily build to
 7.2 and update README

---
 nextcloud/Dockerfile.daily | 2 +-
 nextcloud/README.md        | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 550ca5ae..c562757d 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.1
+FROM hoellen/nginx-php:7.2
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 63f042d2..98692ed5 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -3,14 +3,12 @@
 
 [![](https://images.microbadger.com/badges/version/hoellen/nextcloud.svg)](http://microbadger.com/images/hoellen/nextcloud "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/hoellen/nextcloud.svg)](http://microbadger.com/images/hoellen/nextcloud "Get your own image badge on microbadger.com")
 
-![](https://s32.postimg.org/69nev7aol/Nextcloud_logo.png)
-
 **This image was made for my own use and I have no intention to make this official. Support won't be regular so if there's an update, or a fix, you can open a pull request. Any contribution is welcome, but please be aware I'm very busy currently. Before opening an issue, please check if there's already one related. Also please use Github instead of Docker Hub, otherwise I won't see your comments. Thanks.**
 
 ### Features
 - Based on wonderfall/dockerfiles (Thanks!)
 - Based on Alpine Linux.
-- Bundled with nginx and PHP 7.1 (hoellen/nginx-php image).
+- Bundled with nginx and PHP 7.2 (hoellen/nginx-php image).
 - Automatic installation using environment variables.
 - Package integrity (SHA512) and authenticity (PGP) checked during building process.
 - Data and apps persistence.

From f2c0b1280932f9de74f2054be67d5e7763529181 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 11 Jun 2018 16:29:55 +0200
Subject: [PATCH 081/328] [nextcloud] update to 12.0.9 and 13.0.4

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 0d222bbb..fa24f696 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.8
+ARG NEXTCLOUD_VERSION=12.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.13.0 b/nextcloud/Dockerfile.13.0
index b56b0a77..36003b56 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.3
+ARG NEXTCLOUD_VERSION=13.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 8175ff7791c9484e4502e552e6e6a6f43b74f13a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 24 Jun 2018 09:04:18 +0200
Subject: [PATCH 082/328] [nginx=php] update php to 7.2.7 and 7.1.19

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 9d94ec36..80369732 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.0
-ARG PHP_VER=7.1.18
+ARG PHP_VER=7.1.19
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 380894d0..ea7db16b 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.0
-ARG PHP_VER=7.2.6
+ARG PHP_VER=7.2.7
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 217dae4ca7987fe476aa76afa8e7ff6da5adf7fa Mon Sep 17 00:00:00 2001
From: Sakuragawa Asaba <SakuragawaAsaba@gmail.com>
Date: Tue, 3 Jul 2018 15:10:43 +0800
Subject: [PATCH 083/328] Add missing variables replacement

---
 privatebin/rootfs/usr/local/bin/run.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/privatebin/rootfs/usr/local/bin/run.sh b/privatebin/rootfs/usr/local/bin/run.sh
index 277b8345..0eac2c3b 100644
--- a/privatebin/rootfs/usr/local/bin/run.sh
+++ b/privatebin/rootfs/usr/local/bin/run.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/etc/php-fpm.conf \
-       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MAX_CHILDREN>/$PHP_MAX_CHILDREN/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_START_SERVERS>/$PHP_START_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MIN_SPARE_SERVERS>/$PHP_MIN_SPARE_SERVERS/g" /php/etc/php-fpm.conf \
+       -e "s/<PHP_MAX_SPARE_SERVERS>/$PHP_MAX_SPARE_SERVERS/g" /php/etc/php-fpm.conf
 
 chown -R $UID:$GID /privatebin /nginx /php /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

From d8f5d82f56598301442e7572889861c4c563ce37 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 3 Jul 2018 20:45:56 +0200
Subject: [PATCH 084/328] [nginx-php][boring-nginx] update nginx to 1.15.1

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 14daf3d0..6aa3bae0 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.0
+ARG NGINX_VERSION=1.15.1
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 80369732..ca28b672 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.0
+ARG NGINX_VER=1.15.1
 ARG PHP_VER=7.1.19
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index ea7db16b..f559c2a1 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.0
+ARG NGINX_VER=1.15.1
 ARG PHP_VER=7.2.7
 ARG LIBICONV_VERSION=1.15
 

From 56a58b204709607bd9b49d5216e7327391319df5 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 19 Jul 2018 13:23:30 +0200
Subject: [PATCH 085/328] [nginx-php] update php to 7.1.20 and 7.2.8

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index ca28b672..bf44db48 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.1
-ARG PHP_VER=7.1.19
+ARG PHP_VER=7.1.20
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index f559c2a1..b584f562 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.7
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.1
-ARG PHP_VER=7.2.7
+ARG PHP_VER=7.2.8
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From d91eff125b92b31e9f34479dd7b03f790a448b96 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 22 Jul 2018 12:20:38 +0200
Subject: [PATCH 086/328] [privatebin] update to 1.2

---
 privatebin/Dockerfile | 4 ++--
 privatebin/README.md  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index acccfb25..9d20833a 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.1.1
+ARG PRIVATEBIN_VER=1.2
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \
@@ -28,6 +28,6 @@ EXPOSE 8888
 
 LABEL maintainer="hoellen <info@hoellen.eu>" \
       description="A minimalist, open source online pastebin where the server has zero knowledge of pasted data" \
-      version="PrivateBin 1.1.1"
+      version="PrivateBin 1.2"
 
 CMD ["run.sh"]
diff --git a/privatebin/README.md b/privatebin/README.md
index 078154c3..3b8fef7a 100644
--- a/privatebin/README.md
+++ b/privatebin/README.md
@@ -5,7 +5,7 @@ Paste securely.
 #### Features
 - Based on Alpine Linux (hoellen/nginx-php image)
 - Uses [PrivateBin](https://github.com/PrivateBin/PrivateBin), originally a fork of zerobin by elrido.
-- Bundled with nginx and PHP7.1.
+- Bundled with nginx and PHP7.2
 
 #### Build-time variables
 - **PRIVATEBIN_VER** : version of PrivateBin

From 62b8a46e143f03ca1f1900ab822a319f3f0c8791 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 23 Jul 2018 14:16:11 +0200
Subject: [PATCH 087/328] [nextcloud] update nextcloud to 12.0.10 and 13.0.5

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index fa24f696..11a9f11f 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.9
+ARG NEXTCLOUD_VERSION=12.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 36003b56..122ba3a3 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.4
+ARG NEXTCLOUD_VERSION=13.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 83c2b99580d31ade824ce826eb0dbd07488eeb2b Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 24 Jul 2018 15:43:37 +0200
Subject: [PATCH 088/328] [nginx-php][boring-nginx] update nginx to 1.15.2

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 6aa3bae0..f70349e1 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.1
+ARG NGINX_VERSION=1.15.2
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index bf44db48..ff1cd84f 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.1
+ARG NGINX_VER=1.15.2
 ARG PHP_VER=7.1.20
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index b584f562..1fa9612c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.1
+ARG NGINX_VER=1.15.2
 ARG PHP_VER=7.2.8
 ARG LIBICONV_VERSION=1.15
 

From 56507a1aa2f9e7c47b9a7381bcc8b7481bb26693 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Tue, 24 Jul 2018 20:23:40 +0200
Subject: [PATCH 089/328] [nextcloud] add ability to disable permissions check
 (for large installations)

---
 nextcloud/Dockerfile.12.0             |  3 ++-
 nextcloud/Dockerfile.13.0             |  3 ++-
 nextcloud/README.md                   |  1 +
 nextcloud/rootfs/usr/local/bin/run.sh | 24 ++++++++++++++----------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 11a9f11f..bd3c6d41 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -16,7 +16,8 @@ ENV UID=991 GID=991 \
     CRON_MEMORY_LIMIT=1g \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
-    DOMAIN=localhost
+    DOMAIN=localhost \
+    CHECK_PERMISSIONS=1
 
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 122ba3a3..1db4479d 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -16,7 +16,8 @@ ENV UID=991 GID=991 \
     CRON_MEMORY_LIMIT=1g \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
-    DOMAIN=localhost
+    DOMAIN=localhost \
+    ChECK_PERMISSIONS=1
 
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 98692ed5..0933acc2 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -56,6 +56,7 @@ Other tags than `daily` are built weekly. For security reasons, you should occas
 - **DB_USER** : username for database *(default : none)*
 - **DB_PASSWORD** : password for database user *(default : none)*
 - **DB_HOST** : database host *(default : none)*
+- **CHECK_PERMISSIONS** : disable permission check *(default: 1)*
 
 Don't forget to use a **strong password** for the admin account!
 
diff --git a/nextcloud/rootfs/usr/local/bin/run.sh b/nextcloud/rootfs/usr/local/bin/run.sh
index 6accca22..65c068dc 100644
--- a/nextcloud/rootfs/usr/local/bin/run.sh
+++ b/nextcloud/rootfs/usr/local/bin/run.sh
@@ -22,16 +22,20 @@ if [ ! -d /data/session ]; then
   mkdir -p /data/session;
 fi
 
-echo "Updating permissions..."
-for dir in /nextcloud /data /config /apps2 /var/log /php /nginx /tmp /etc/s6.d; do
-  if $(find $dir ! -user $UID -o ! -group $GID|egrep '.' -q); then
-    echo "Updating permissions in $dir..."
-    chown -R $UID:$GID $dir
-  else
-    echo "Permissions in $dir are correct."
-  fi
-done
-echo "Done updating permissions."
+if [ "$CHECK_PERMISSIONS" = "1" ]; then
+  echo "Updating permissions..."
+  for dir in /nextcloud /data /config /apps2 /var/log /php /nginx /tmp /etc/s6.d; do
+    if $(find $dir ! -user $UID -o ! -group $GID|egrep '.' -q); then
+      echo "Updating permissions in $dir..."
+      chown -R $UID:$GID $dir
+    else
+      echo "Permissions in $dir are correct."
+    fi
+  done
+  echo "Done updating permissions."
+else
+  echo "Skip checking permissions"
+fi
 
 if [ ! -f /config/config.php ]; then
     # New installation, run the setup

From aa1ed3a74ba7f9c1c9aad52012d3259476155b51 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Fri, 27 Jul 2018 12:45:22 +0200
Subject: [PATCH 090/328] [nextcloud] add nextcloud 14.0.0 beta1

---
 nextcloud/Dockerfile.14.0 | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 nextcloud/Dockerfile.14.0

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
new file mode 100644
index 00000000..224cd8e7
--- /dev/null
+++ b/nextcloud/Dockerfile.14.0
@@ -0,0 +1,76 @@
+FROM hoellen/nginx-php:7.2
+
+ARG NEXTCLOUD_VERSION=14.0.0beta1
+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/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From 57230ffdf1b456169829ef6e90437833387c8b0f Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 29 Jul 2018 15:25:48 +0200
Subject: [PATCH 091/328] [nextcloud] fix permissions check

---
 nextcloud/Dockerfile.13.0             |  2 +-
 nextcloud/Dockerfile.14.0             |  2 +-
 nextcloud/README.md                   |  2 +-
 nextcloud/rootfs/usr/local/bin/run.sh | 28 +++++++++++++--------------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 1db4479d..ce56a7f4 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -17,7 +17,7 @@ ENV UID=991 GID=991 \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost \
-    ChECK_PERMISSIONS=1
+    CHECK_PERMISSIONS=1
 
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 224cd8e7..c047f0cd 100644
--- a/nextcloud/Dockerfile.14.0
+++ b/nextcloud/Dockerfile.14.0
@@ -17,7 +17,7 @@ ENV UID=991 GID=991 \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost \
-    ChECK_PERMISSIONS=1
+    CHECK_PERMISSIONS=1
 
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 0933acc2..33a6b80d 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -56,7 +56,7 @@ Other tags than `daily` are built weekly. For security reasons, you should occas
 - **DB_USER** : username for database *(default : none)*
 - **DB_PASSWORD** : password for database user *(default : none)*
 - **DB_HOST** : database host *(default : none)*
-- **CHECK_PERMISSIONS** : disable permission check *(default: 1)*
+- **CHECK_PERMISSIONS** : disable permission check for /data folder *(default: 1)*
 
 Don't forget to use a **strong password** for the admin account!
 
diff --git a/nextcloud/rootfs/usr/local/bin/run.sh b/nextcloud/rootfs/usr/local/bin/run.sh
index 65c068dc..aea112cb 100644
--- a/nextcloud/rootfs/usr/local/bin/run.sh
+++ b/nextcloud/rootfs/usr/local/bin/run.sh
@@ -22,20 +22,20 @@ if [ ! -d /data/session ]; then
   mkdir -p /data/session;
 fi
 
-if [ "$CHECK_PERMISSIONS" = "1" ]; then
-  echo "Updating permissions..."
-  for dir in /nextcloud /data /config /apps2 /var/log /php /nginx /tmp /etc/s6.d; do
-    if $(find $dir ! -user $UID -o ! -group $GID|egrep '.' -q); then
-      echo "Updating permissions in $dir..."
-      chown -R $UID:$GID $dir
-    else
-      echo "Permissions in $dir are correct."
-    fi
-  done
-  echo "Done updating permissions."
-else
-  echo "Skip checking permissions"
-fi
+echo "Updating permissions..."
+for dir in /nextcloud /data /config /apps2 /var/log /php /nginx /tmp /etc/s6.d; do
+  if [ "$dir" = "/data" ] && [ "$CHECK_PERMISSIONS" = "0" ]; then
+    echo "WARNING: Skip checking permissions for /data"
+    continue
+  fi
+  if $(find $dir ! -user $UID -o ! -group $GID|egrep '.' -q); then
+    echo "Updating permissions in $dir..."
+    chown -R $UID:$GID $dir
+  else
+    echo "Permissions in $dir are correct."
+  fi
+done
+echo "Done updating permissions."
 
 if [ ! -f /config/config.php ]; then
     # New installation, run the setup

From 5b66db9dd6e4cd8c4cfd77ac17335d04c70598e4 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Mon, 30 Jul 2018 17:43:27 +0200
Subject: [PATCH 092/328] update alpine images to 3.8

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 searx/Dockerfile         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f70349e1..0b303803 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 ENV UID=991 GID=991
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index ff1cd84f..33b8c1bf 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 1fa9612c..b469ba30 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 ARG BUILD_CORES
 
diff --git a/searx/Dockerfile b/searx/Dockerfile
index 9c255eaf..029c6e33 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 ARG VERSION=0.14.0
 

From 503f526328ed3f7475ddc59eefabe18a8095bf9f Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Wed, 1 Aug 2018 15:55:40 +0200
Subject: [PATCH 093/328] adding signature check for PrivateBin archive

---
 privatebin/Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 9d20833a..0f433182 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -10,13 +10,19 @@ ENV GID=991 UID=991 \
     PHP_MIN_SPARE_SERVERS=1 \
     PHP_MAX_SPARE_SERVERS=6
 
-RUN BUILD_DEPS="tar libressl ca-certificates" \
+RUN BUILD_DEPS="tar gnupg" \
  && apk -U upgrade && apk add $BUILD_DEPS \
  && mkdir privatebin && cd privatebin \
- && wget -qO- https://github.com/PrivateBin/PrivateBin/archive/${PRIVATEBIN_VER}.tar.gz | tar xz --strip 1 \
+ && export GNUPGHOME="$(mktemp -d)" \
+ && gpg2 --list-public-keys || /bin/true \
+ && wget -qO- https://privatebin.info/key/security.asc | gpg2 --import - \
+ && wget -qO /privatebin.tar.gz.asc https://github.com/PrivateBin/PrivateBin/releases/download/${PRIVATEBIN_VER}/PrivateBin-${PRIVATEBIN_VER}.tar.gz.asc \
+ && wget -qO /privatebin.tar.gz https://github.com/PrivateBin/PrivateBin/archive/${PRIVATEBIN_VER}.tar.gz \
+ && gpg2 --verify /privatebin.tar.gz.asc \
+ && tar -xzf /privatebin.tar.gz --strip 1 \
  && mv cfg/conf.sample.php cfg/conf.php \
  && apk del $BUILD_DEPS \
- && rm -f /var/cache/apk/*
+ && rm -rf /var/cache/apk/* /privatebin.tar.gz* "${GNUPGHOME}"
 
 COPY rootfs /
 

From 7be188fda2cb987c9339d5d0acf910cd88fab692 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Wed, 1 Aug 2018 16:33:51 +0200
Subject: [PATCH 094/328] securing PrivateBin installation, by moving
 unneccessary bits out of the web root, making image support read-only
 operation, consistent white spaces in nginx config

---
 privatebin/Dockerfile                         | 14 +++--
 .../rootfs/nginx/sites-enabled/nginx.conf     | 54 +++++++++----------
 privatebin/rootfs/usr/local/bin/run.sh        |  2 +-
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 0f433182..44cd70e8 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -12,23 +12,29 @@ ENV GID=991 UID=991 \
 
 RUN BUILD_DEPS="tar gnupg" \
  && apk -U upgrade && apk add $BUILD_DEPS \
- && mkdir privatebin && cd privatebin \
+ && mkdir -p privatebin/data privatebin/cfg \
  && export GNUPGHOME="$(mktemp -d)" \
  && gpg2 --list-public-keys || /bin/true \
  && wget -qO- https://privatebin.info/key/security.asc | gpg2 --import - \
  && wget -qO /privatebin.tar.gz.asc https://github.com/PrivateBin/PrivateBin/releases/download/${PRIVATEBIN_VER}/PrivateBin-${PRIVATEBIN_VER}.tar.gz.asc \
  && wget -qO /privatebin.tar.gz https://github.com/PrivateBin/PrivateBin/archive/${PRIVATEBIN_VER}.tar.gz \
  && gpg2 --verify /privatebin.tar.gz.asc \
+ && cd srv \
  && tar -xzf /privatebin.tar.gz --strip 1 \
- && mv cfg/conf.sample.php cfg/conf.php \
+ && mv cfg /privatebin \
+ && mv lib /privatebin \
+ && mv tpl /privatebin \
+ && mv vendor /privatebin \
+ && sed -i "s#define('PATH', '');#define('PATH', '/privatebin/');#" index.php \
  && apk del $BUILD_DEPS \
- && rm -rf /var/cache/apk/* /privatebin.tar.gz* "${GNUPGHOME}"
+ && rm -rf /var/cache/apk/* *.md /privatebin.tar.gz* "${GNUPGHOME}"
 
 COPY rootfs /
 
 RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
 
-VOLUME /privatebin/data /php/session
+# mark dirs as volumes that need to be writable, allows running the container --read-only
+VOLUME /privatebin/data /php /nginx /tmp /etc/s6.d
 
 EXPOSE 8888
 
diff --git a/privatebin/rootfs/nginx/sites-enabled/nginx.conf b/privatebin/rootfs/nginx/sites-enabled/nginx.conf
index 8765f488..6e923cef 100644
--- a/privatebin/rootfs/nginx/sites-enabled/nginx.conf
+++ b/privatebin/rootfs/nginx/sites-enabled/nginx.conf
@@ -1,33 +1,33 @@
 server {
-        listen 8888;
-        root /privatebin;
-        index index.php index.html;
+    listen 8888;
+    root /srv;
+    index index.php;
 
-        location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
-            expires 30d;
-            access_log off;
-	}
+    location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
+        expires 30d;
+        access_log off;
+    }
 
-        location ~ ^/(data|cfg|tmp) {                                        
-            deny all;                                                        
-        }                                                                    
-                                                                             
-        location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {  
-            deny all;                                                        
-        } 
-    
-        location ~ /\. {
-            deny all;
-        }
+    location ~ ^/(data|cfg|tmp) {
+        deny all;
+    }
 
-        location / {
-	    try_files $uri $uri/ /index.php;
-        }
+    location ~* /(.*)\.(?:markdown|md|twig|yaml|yml|ht|htaccess|ini)$ {
+        deny all;
+    }
 
-	location ~ \.php$ {
-            fastcgi_index index.php;
-            fastcgi_pass unix:/php/run/php-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include /nginx/conf/fastcgi_params;
-	}
+    location ~ /\. {
+        deny all;
+    }
+
+    location / {
+        try_files $uri $uri/ /index.php;
+    }
+
+    location ~ \.php$ {
+        fastcgi_index index.php;
+        fastcgi_pass unix:/php/run/php-fpm.sock;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include /nginx/conf/fastcgi_params;
+    }
 }
diff --git a/privatebin/rootfs/usr/local/bin/run.sh b/privatebin/rootfs/usr/local/bin/run.sh
index 0eac2c3b..e453f2d1 100644
--- a/privatebin/rootfs/usr/local/bin/run.sh
+++ b/privatebin/rootfs/usr/local/bin/run.sh
@@ -6,5 +6,5 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /nginx/conf/nginx.conf /php/e
        -e "s/<PHP_MIN_SPARE_SERVERS>/$PHP_MIN_SPARE_SERVERS/g" /php/etc/php-fpm.conf \
        -e "s/<PHP_MAX_SPARE_SERVERS>/$PHP_MAX_SPARE_SERVERS/g" /php/etc/php-fpm.conf
 
-chown -R $UID:$GID /privatebin /nginx /php /tmp /etc/s6.d
+chown -R $UID:$GID /privatebin/data /nginx /php /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

From e93e9221aa1e32819e6417411a845bd6b415184a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sat, 4 Aug 2018 15:10:07 +0200
Subject: [PATCH 095/328] [nextcloud] update to nextcloud 14.0-beta2

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index c047f0cd..b3a76f49 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.0beta1
+ARG NEXTCLOUD_VERSION=14.0.0beta2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From f644edac3125c1e831ce5c1201319e4043babd05 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Thu, 9 Aug 2018 13:26:12 +0200
Subject: [PATCH 096/328] [nextcloud] update to nextcloud 14.0-beta3

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index b3a76f49..c8288047 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.0beta2
+ARG NEXTCLOUD_VERSION=14.0.0beta3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 038d886eb4c21005bf642e269c8b9acf603f9945 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sat, 11 Aug 2018 23:31:36 +0200
Subject: [PATCH 097/328] release 1.2.1

---
 privatebin/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 44cd70e8..0f4a1c0c 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.2
+ARG PRIVATEBIN_VER=1.2.1
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \
@@ -15,7 +15,7 @@ RUN BUILD_DEPS="tar gnupg" \
  && mkdir -p privatebin/data privatebin/cfg \
  && export GNUPGHOME="$(mktemp -d)" \
  && gpg2 --list-public-keys || /bin/true \
- && wget -qO- https://privatebin.info/key/security.asc | gpg2 --import - \
+ && wget -qO- https://privatebin.info/key/release.asc | gpg2 --import - \
  && wget -qO /privatebin.tar.gz.asc https://github.com/PrivateBin/PrivateBin/releases/download/${PRIVATEBIN_VER}/PrivateBin-${PRIVATEBIN_VER}.tar.gz.asc \
  && wget -qO /privatebin.tar.gz https://github.com/PrivateBin/PrivateBin/archive/${PRIVATEBIN_VER}.tar.gz \
  && gpg2 --verify /privatebin.tar.gz.asc \

From e95e2596b40ad218540b9b0fef9de50d81ae8ce4 Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 12 Aug 2018 10:52:15 +0200
Subject: [PATCH 098/328] update README

---
 privatebin/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/privatebin/README.md b/privatebin/README.md
index 3b8fef7a..e44df158 100644
--- a/privatebin/README.md
+++ b/privatebin/README.md
@@ -5,6 +5,8 @@ Paste securely.
 #### Features
 - Based on Alpine Linux (hoellen/nginx-php image)
 - Uses [PrivateBin](https://github.com/PrivateBin/PrivateBin), originally a fork of zerobin by elrido.
+- GPG signature check
+- separate /data directory
 - Bundled with nginx and PHP7.2
 
 #### Build-time variables

From 0ee2ff6973b1583e958d86149aa592e02adfe126 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 Aug 2018 15:20:36 +0200
Subject: [PATCH 099/328] [nextcloud] update to nextcloud 14.0-beta4

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index c8288047..09b4b17b 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.0beta3
+ARG NEXTCLOUD_VERSION=14.0.0beta4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 0d3ba862b5a58ff7dc712676115ee173cebac29c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 Aug 2018 21:06:14 +0200
Subject: [PATCH 100/328] [nginx-php] update php to 7.2.9 and 7.1.21

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 33b8c1bf..39f6fc81 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.2
-ARG PHP_VER=7.1.20
+ARG PHP_VER=7.1.21
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index b469ba30..6745531a 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.2
-ARG PHP_VER=7.2.8
+ARG PHP_VER=7.2.9
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 95a24c2d9a17f8bdec3173ba2cd9938fd0c36bef Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 25 Aug 2018 18:51:22 +0200
Subject: [PATCH 101/328] [nextcloud] update to nextcloud 14.0.0 RC1

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 09b4b17b..deb04542 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.0beta4
+ARG NEXTCLOUD_VERSION=14.0.0RC1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 502cf8ea3f521affc94325f72252aaba34b83193 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 28 Aug 2018 22:11:33 +0200
Subject: [PATCH 102/328] [nginx-php][boring-nginx] update nginx to 1.15.3

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 0b303803..a56b4415 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.2
+ARG NGINX_VERSION=1.15.3
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 39f6fc81..c6a6cdbe 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.2
+ARG NGINX_VER=1.15.3
 ARG PHP_VER=7.1.21
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 6745531a..ac04c7e9 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.2
+ARG NGINX_VER=1.15.3
 ARG PHP_VER=7.2.9
 ARG LIBICONV_VERSION=1.15
 

From b35e77e58d4e741f79e43bec28a713d300447ce8 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 29 Aug 2018 08:50:11 +0200
Subject: [PATCH 103/328] [matomo] update to 3.6.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 8787def4..f53c38ab 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.5.1
+ARG VERSION=3.6.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 9fefa338e28d3b547ffcaae6c67c10b2b6ddc213 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 Aug 2018 15:10:01 +0200
Subject: [PATCH 104/328] [nextcloud] update nextcloud to 13.0.6 and 12.0.11

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index bd3c6d41..72816a65 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.10
+ARG NEXTCLOUD_VERSION=12.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index ce56a7f4..9827cfa1 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.5
+ARG NEXTCLOUD_VERSION=13.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 18557b455efc52936832e61beae40a66e1b1cc30 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 Aug 2018 21:13:21 +0200
Subject: [PATCH 105/328] removed tls1.3 patch for boring-nginx because wih
 nginx 1.15.3 it works out of the box with boringSSL.

---
 boring-nginx/Dockerfile  |  2 --
 boring-nginx/tls13.patch | 63 ----------------------------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 boring-nginx/tls13.patch

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index a56b4415..a676c362 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -85,8 +85,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
- && wget -q https://raw.githubusercontent.com/cujanovic/nginx-dynamic-tls-records-patch/master/nginx__dynamic_tls_records_1.13.0%2B.patch -O dynamic_records.patch \
- && patch -p1 < dynamic_records.patch \
  && ./configure \
     --prefix=/etc/nginx \
     --sbin-path=/usr/sbin/nginx \
diff --git a/boring-nginx/tls13.patch b/boring-nginx/tls13.patch
deleted file mode 100644
index cc0d728c..00000000
--- a/boring-nginx/tls13.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From cfc32a1e540e4f542egggd3008 Mon Sep 17 00:00:00 2001
-From: Buik / Bassie <bassie@buik.locale>
-Date: Tue, 09 Apr 2018 12:55:23 +0800
-
-Subject: [PATCH] Enable TLS 1.3 on BoringSSL
-
-Enable TLS 1.3 on BoringSSL.
-Tested on Nginx 1.13.11 with BoringSSL chromium-stable and BoringSSL master (git branch April 09 2018)
-
---- 
- s3_lib.cc       | 2 +-
- ssl_test.cc     | 4 ++--
- ssl_versions.cc | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ssl/s3_lib.cc b/ssl/s3_lib.cc
-index a3fc8d7..b28bbc8 100644
---- a/ssl/s3_lib.cc
-+++ b/ssl/s3_lib.cc
-@@ -201,7 +201,7 @@ bool ssl3_new(SSL *ssl) {
-   // TODO(davidben): Move this field into |s3|, have it store the normalized
-   // protocol version, and implement this pre-negotiation quirk in |SSL_version|
-   // at the API boundary rather than in internal state.
--  ssl->version = TLS1_2_VERSION;
-+  ssl->version = TLS1_3_VERSION;
-   return true;
- }
- 
-diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
-index 12f044c..cfc4af1 100644
---- a/ssl/ssl_test.cc
-+++ b/ssl/ssl_test.cc
-@@ -2607,7 +2607,7 @@ TEST(SSLTest, SetVersion) {
- 
-   // Zero is the default version.
-   EXPECT_TRUE(SSL_CTX_set_max_proto_version(ctx.get(), 0));
--  EXPECT_EQ(TLS1_2_VERSION, ctx->conf_max_version);
-+  EXPECT_EQ(TLS1_3_VERSION, ctx->conf_max_version);
-   EXPECT_TRUE(SSL_CTX_set_min_proto_version(ctx.get(), 0));
-   EXPECT_EQ(TLS1_VERSION, ctx->conf_min_version);
- 
-@@ -2640,7 +2640,7 @@ TEST(SSLTest, SetVersion) {
-   EXPECT_FALSE(SSL_CTX_set_min_proto_version(ctx.get(), 0x1234));
- 
-   EXPECT_TRUE(SSL_CTX_set_max_proto_version(ctx.get(), 0));
--  EXPECT_EQ(TLS1_2_VERSION, ctx->conf_max_version);
-+  EXPECT_EQ(TLS1_3_VERSION, ctx->conf_max_version);
-   EXPECT_TRUE(SSL_CTX_set_min_proto_version(ctx.get(), 0));
-   EXPECT_EQ(TLS1_1_VERSION, ctx->conf_min_version);
- }
-diff --git a/ssl/ssl_versions.cc b/ssl/ssl_versions.cc
-index 73ea26f..da10cb2 100644
---- a/ssl/ssl_versions.cc
-+++ b/ssl/ssl_versions.cc
-@@ -189,7 +189,7 @@ static bool set_max_version(const SSL_PROTOCOL_METHOD *method, uint16_t *out,
-                             uint16_t version) {
-   // Zero is interpreted as the default maximum version.
-   if (version == 0) {
--    *out = TLS1_2_VERSION;
-+    *out = TLS1_3_VERSION;
-     return true;
-   }
- 

From d7ba40893fb2bc2dcdac663812ec984240524b8d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 Aug 2018 22:12:23 +0200
Subject: [PATCH 106/328] fix prev commit. remove the right patch

---
 boring-nginx/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index a676c362..18f46420 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -64,8 +64,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && cd /tmp && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \
  && git clone https://boringssl.googlesource.com/boringssl --depth=1 \
  && cd boringssl \
- && wget https://gitlab.com/buik/boringssl/raw/boringssl-patch/Enable-TLS13-BoringSSL.patch -O tls13.patch \
- && git apply tls13.patch \
  && sed -i 's@\$shaext[ ]*=[ ]*0;@\$shaext = 1;@' crypto/*/*/asm/*.pl \
  && sed -i 's@\$avx[ ]*=[ ]*[0|1];@\$avx = 2;@' crypto/*/*/asm/*.pl \
  && sed -i 's@\$addx[ ]*=[ ]*0;@\$addx = 1;@' crypto/*/*/asm/*.pl \
@@ -85,6 +83,8 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
+ && wget -q https://raw.githubusercontent.com/cujanovic/nginx-dynamic-tls-records-patch/master/nginx__dynamic_tls_records_1.13.0%2B.patch -O dynamic_records.patch \
+ && patch -p1 < dynamic_records.patch \
  && ./configure \
     --prefix=/etc/nginx \
     --sbin-path=/usr/sbin/nginx \

From 7750ed0065da88e92b5a19ad8f08929d63f850da Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 31 Aug 2018 15:43:04 +0200
Subject: [PATCH 107/328] update nextcloud to 14.0-RC2

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index deb04542..d0928d99 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.0RC1
+ARG NEXTCLOUD_VERSION=14.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From d61466f37dfdf97d3fb1e77c88a8823c5d2377dc Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 6 Sep 2018 09:59:48 +0200
Subject: [PATCH 108/328] update nextcloud to final 14.0

---
 nextcloud/Dockerfile.14.0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index d0928d99..acdf5068 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.0RC2
+ARG NEXTCLOUD_VERSION=14.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -43,9 +43,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From d38e9186269f64cb1c82a2b3ebfb287fd7be1075 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 6 Sep 2018 11:06:25 +0200
Subject: [PATCH 109/328] change referrer policy from same-origin to
 strict-origin

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index b9744c81..24947e5b 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -1,16 +1,16 @@
 server {
         listen 8888;
         root /nextcloud;
-        
+
         fastcgi_buffers 64 4K;
-        
+
         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload";
         add_header X-Content-Type-Options nosniff;
         add_header X-XSS-Protection "1; mode=block";
         add_header X-Robots-Tag none;
         add_header X-Download-Options noopen;
         add_header X-Permitted-Cross-Domain-Policies none;
-        add_header Referrer-Policy "same-origin";
+        add_header Referrer-Policy "strict-origin";
 
         location = /robots.txt {
             allow all;

From b45c72bbc2f9015fa9d037bf51af2b2e0ae879a4 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 7 Sep 2018 14:47:44 +0200
Subject: [PATCH 110/328] fix dynamic tls patch (offset) and copy fixed patch
 to repository

---
 boring-nginx/Dockerfile            |   2 +-
 boring-nginx/dynamic_records.patch | 252 +++++++++++++++++++++++++++++
 2 files changed, 253 insertions(+), 1 deletion(-)
 create mode 100644 boring-nginx/dynamic_records.patch

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 18f46420..e64365fa 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -83,7 +83,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
- && wget -q https://raw.githubusercontent.com/cujanovic/nginx-dynamic-tls-records-patch/master/nginx__dynamic_tls_records_1.13.0%2B.patch -O dynamic_records.patch \
+ && wget -q https://raw.githubusercontent.com/hoellen/dockerfiles/fix-dynamic-tls/boring-nginx/dynamic_records.patch -O dynamic_records.patch \
  && patch -p1 < dynamic_records.patch \
  && ./configure \
     --prefix=/etc/nginx \
diff --git a/boring-nginx/dynamic_records.patch b/boring-nginx/dynamic_records.patch
new file mode 100644
index 00000000..6ec15bd4
--- /dev/null
+++ b/boring-nginx/dynamic_records.patch
@@ -0,0 +1,252 @@
+What we do now:
+We use a static record size of 4K. This gives a good balance of latency and
+throughput.
+
+Optimize latency:
+By initialy sending small (1 TCP segment) sized records, we are able to avoid
+HoL blocking of the first byte. This means TTFB is sometime lower by a whole
+RTT.
+
+Optimizing throughput:
+By sending increasingly larger records later in the connection, when HoL is not
+a problem, we reduce the overhead of TLS record (29 bytes per record with
+GCM/CHACHA-POLY).
+
+Logic:
+Start each connection with small records (1369 byte default, change with
+ssl_dyn_rec_size_lo). After a given number of records (40, change with
+ssl_dyn_rec_threshold) start sending larger records (4229, ssl_dyn_rec_size_hi).
+Eventually after the same number of records, start sending the largest records
+(ssl_buffer_size).
+In case the connection idles for a given amount of time (1s,
+ssl_dyn_rec_timeout), the process repeats itself (i.e. begin sending small
+records again).
+
+Upstream source:
+https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_records.patch
+
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1239,6 +1239,7 @@
+ 
+     sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
+     sc->buffer_size = ssl->buffer_size;
++    sc->dyn_rec = ssl->dyn_rec;
+ 
+     sc->session_ctx = ssl->ctx;
+ 
+@@ -1806,6 +1807,41 @@
+ 
+     for ( ;; ) {
+ 
++        /* Dynamic record resizing:
++           We want the initial records to fit into one TCP segment
++           so we don't get TCP HoL blocking due to TCP Slow Start.
++           A connection always starts with small records, but after
++           a given amount of records sent, we make the records larger
++           to reduce header overhead.
++           After a connection has idled for a given timeout, begin
++           the process from the start. The actual parameters are
++           configurable. If dyn_rec_timeout is 0, we assume dyn_rec is off. */
++
++        if (c->ssl->dyn_rec.timeout > 0 ) {
++
++            if (ngx_current_msec - c->ssl->dyn_rec_last_write >
++                c->ssl->dyn_rec.timeout)
++            {
++                buf->end = buf->start + c->ssl->dyn_rec.size_lo;
++                c->ssl->dyn_rec_records_sent = 0;
++
++            } else {
++                if (c->ssl->dyn_rec_records_sent >
++                    c->ssl->dyn_rec.threshold * 2)
++                {
++                    buf->end = buf->start + c->ssl->buffer_size;
++
++                } else if (c->ssl->dyn_rec_records_sent >
++                           c->ssl->dyn_rec.threshold)
++                {
++                    buf->end = buf->start + c->ssl->dyn_rec.size_hi;
++
++                } else {
++                    buf->end = buf->start + c->ssl->dyn_rec.size_lo;
++                }
++            }
++        }
++
+         while (in && buf->last < buf->end && send < limit) {
+             if (in->buf->last_buf || in->buf->flush) {
+                 flush = 1;
+@@ -1907,6 +1643,9 @@
+ 
+     if (n > 0) {
+ 
++        c->ssl->dyn_rec_records_sent++;
++        c->ssl->dyn_rec_last_write = ngx_current_msec;
++
+         if (c->ssl->saved_read_handler) {
+ 
+             c->read->handler = c->ssl->saved_read_handler;
+--- a/src/event/ngx_event_openssl.h
++++ b/src/event/ngx_event_openssl.h
+@@ -64,10 +64,19 @@
+ #endif
+ 
+ 
++typedef struct {
++    ngx_msec_t                  timeout;
++    ngx_uint_t                  threshold;
++    size_t                      size_lo;
++    size_t                      size_hi;
++} ngx_ssl_dyn_rec_t;
++
++
+ struct ngx_ssl_s {
+     SSL_CTX                    *ctx;
+     ngx_log_t                  *log;
+     size_t                      buffer_size;
++    ngx_ssl_dyn_rec_t           dyn_rec;
+ };
+ 
+ 
+@@ -93,6 +102,10 @@
+     unsigned                    no_wait_shutdown:1;
+     unsigned                    no_send_shutdown:1;
+     unsigned                    handshake_buffer_set:1;
++
++    ngx_ssl_dyn_rec_t           dyn_rec;
++    ngx_msec_t                  dyn_rec_last_write;
++    ngx_uint_t                  dyn_rec_records_sent;
+ };
+ 
+ 
+@@ -102,7 +115,7 @@
+ #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
+ 
+ 
+-#define NGX_SSL_MAX_SESSION_SIZE  4096
++#define NGX_SSL_MAX_SESSION_SIZE  16384
+ 
+ typedef struct ngx_ssl_sess_id_s  ngx_ssl_sess_id_t;
+ 
+--- a/src/http/modules/ngx_http_ssl_module.c
++++ b/src/http/modules/ngx_http_ssl_module.c
+@@ -246,6 +246,41 @@
+       offsetof(ngx_http_ssl_srv_conf_t, early_data),
+       NULL },
+ 
++    { ngx_string("ssl_dyn_rec_enable"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_flag_slot,
++      NGX_HTTP_SRV_CONF_OFFSET,
++      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_enable),
++      NULL },
++
++    { ngx_string("ssl_dyn_rec_timeout"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_msec_slot,
++      NGX_HTTP_SRV_CONF_OFFSET,
++      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_timeout),
++      NULL },
++
++    { ngx_string("ssl_dyn_rec_size_lo"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_size_slot,
++      NGX_HTTP_SRV_CONF_OFFSET,
++      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_size_lo),
++      NULL },
++
++    { ngx_string("ssl_dyn_rec_size_hi"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_size_slot,
++      NGX_HTTP_SRV_CONF_OFFSET,
++      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_size_hi),
++      NULL },
++
++    { ngx_string("ssl_dyn_rec_threshold"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_num_slot,
++      NGX_HTTP_SRV_CONF_OFFSET,
++      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_threshold),
++      NULL },
++
+       ngx_null_command
+ };
+ 
+@@ -576,6 +611,11 @@
+     sscf->session_ticket_keys = NGX_CONF_UNSET_PTR;
+     sscf->stapling = NGX_CONF_UNSET;
+     sscf->stapling_verify = NGX_CONF_UNSET;
++    sscf->dyn_rec_enable = NGX_CONF_UNSET;
++    sscf->dyn_rec_timeout = NGX_CONF_UNSET_MSEC;
++    sscf->dyn_rec_size_lo = NGX_CONF_UNSET_SIZE;
++    sscf->dyn_rec_size_hi = NGX_CONF_UNSET_SIZE;
++    sscf->dyn_rec_threshold = NGX_CONF_UNSET_UINT;
+ 
+     return sscf;
+ }
+@@ -643,6 +683,20 @@
+     ngx_conf_merge_str_value(conf->stapling_responder,
+                          prev->stapling_responder, "");
+ 
++    ngx_conf_merge_value(conf->dyn_rec_enable, prev->dyn_rec_enable, 0);
++    ngx_conf_merge_msec_value(conf->dyn_rec_timeout, prev->dyn_rec_timeout,
++                             1000);
++    /* Default sizes for the dynamic record sizes are defined to fit maximal
++       TLS + IPv6 overhead in a single TCP segment for lo and 3 segments for hi:
++       1369 = 1500 - 40 (IP) - 20 (TCP) - 10 (Time) - 61 (Max TLS overhead) */
++    ngx_conf_merge_size_value(conf->dyn_rec_size_lo, prev->dyn_rec_size_lo,
++                             1369);
++    /* 4229 = (1500 - 40 - 20 - 10) * 3  - 61 */
++    ngx_conf_merge_size_value(conf->dyn_rec_size_hi, prev->dyn_rec_size_hi,
++                             4229);
++    ngx_conf_merge_uint_value(conf->dyn_rec_threshold, prev->dyn_rec_threshold,
++                             40);
++
+     conf->ssl.log = cf->log;
+ 
+     if (conf->enable) {
+@@ -827,6 +881,28 @@
+         return NGX_CONF_ERROR;
+     }
+ 
++    if (conf->dyn_rec_enable) {
++        conf->ssl.dyn_rec.timeout = conf->dyn_rec_timeout;
++        conf->ssl.dyn_rec.threshold = conf->dyn_rec_threshold;
++
++        if (conf->buffer_size > conf->dyn_rec_size_lo) {
++            conf->ssl.dyn_rec.size_lo = conf->dyn_rec_size_lo;
++
++        } else {
++            conf->ssl.dyn_rec.size_lo = conf->buffer_size;
++        }
++
++        if (conf->buffer_size > conf->dyn_rec_size_hi) {
++            conf->ssl.dyn_rec.size_hi = conf->dyn_rec_size_hi;
++
++        } else {
++            conf->ssl.dyn_rec.size_hi = conf->buffer_size;
++        }
++
++    } else {
++        conf->ssl.dyn_rec.timeout = 0;
++    }
++
+     return NGX_CONF_OK;
+ }
+ 
+--- a/src/http/modules/ngx_http_ssl_module.h
++++ b/src/http/modules/ngx_http_ssl_module.h
+@@ -58,6 +58,12 @@
+ 
+     u_char                         *file;
+     ngx_uint_t                      line;
++
++    ngx_flag_t                      dyn_rec_enable;
++    ngx_msec_t                      dyn_rec_timeout;
++    size_t                          dyn_rec_size_lo;
++    size_t                          dyn_rec_size_hi;
++    ngx_uint_t                      dyn_rec_threshold;
+ } ngx_http_ssl_srv_conf_t;
+ 
+ 

From 4fa08f5f2d22f1de728621d34f3c2ef9398de318 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 7 Sep 2018 15:27:07 +0200
Subject: [PATCH 111/328] fix merge for fix-dynamic-tls

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index e64365fa..d2abff6f 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -83,7 +83,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
- && wget -q https://raw.githubusercontent.com/hoellen/dockerfiles/fix-dynamic-tls/boring-nginx/dynamic_records.patch -O dynamic_records.patch \
+ && wget -q https://raw.githubusercontent.com/hoellen/dockerfiles/master/boring-nginx/dynamic_records.patch -O dynamic_records.patch \
  && patch -p1 < dynamic_records.patch \
  && ./configure \
     --prefix=/etc/nginx \

From 0d8c8d49f856286d60272c1a78198601f43ef1e4 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Fri, 14 Sep 2018 08:58:25 +0200
Subject: [PATCH 112/328] update php to 7.1.22 and 7.2.10

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index c6a6cdbe..29f7d5e6 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.3
-ARG PHP_VER=7.1.21
+ARG PHP_VER=7.1.22
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index ac04c7e9..157b96ac 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.3
-ARG PHP_VER=7.2.9
+ARG PHP_VER=7.2.10
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 12e6dfbe911c665074bedf789ddd7c32d58fcce9 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 25 Sep 2018 09:26:30 +0200
Subject: [PATCH 113/328] update nextcloud to 14.0.1

---
 nextcloud/Dockerfile.14.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index acdf5068..358af8d3 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.0
+ARG NEXTCLOUD_VERSION=14.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 07fc3e3f946d1d2134583c1b57eff1c25120acf8 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 25 Sep 2018 09:53:44 +0200
Subject: [PATCH 114/328] update nextcloud opcache settings

---
 nextcloud/rootfs/php/conf.d/opcache.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/rootfs/php/conf.d/opcache.ini b/nextcloud/rootfs/php/conf.d/opcache.ini
index d77112b7..6deabb37 100644
--- a/nextcloud/rootfs/php/conf.d/opcache.ini
+++ b/nextcloud/rootfs/php/conf.d/opcache.ini
@@ -1,8 +1,8 @@
 zend_extension=opcache.so
 opcache.enable=1
 opcache.enable_cli=1
-opcache.fast_shutdown=1
 opcache.memory_consumption=<OPCACHE_MEM_SIZE>
 opcache.interned_strings_buffer=16
+opcache.save_comments=1
 opcache.max_accelerated_files=10000
 opcache.revalidate_freq=60

From b3464c0b3ea9631f0f4c0979759eb99c514665f7 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 25 Sep 2018 09:56:35 +0200
Subject: [PATCH 115/328] update nextcloud readme

---
 nextcloud/README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 33a6b80d..8e9dabef 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,11 +21,12 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version. (13.0)
-- **13.0** : latest 13.0.x version (stable)
-- **12.0** : latest 12.0.x version (old stable)
+- **latest** : latest stable version (14.0)
+- **14.0** : latest 14.0.x version (stable)
+- **13.0** : latest 13.0.x version (old stable)
+- **12.0** : latest 12.0.x version (deprecated)
 - ~~**11.0** : latest 11.0.x version (end-of-life)~~
-- **daily** : latest code (daily build).
+- **daily** : latest code (daily build)
 
 Other tags than `daily` are built weekly. For security reasons, you should occasionally update the container, even if you have the latest version of Nextcloud.
 

From 7cda0dc28a66eb747d1cede90ac9aed285ae31b1 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 25 Sep 2018 18:01:31 +0200
Subject: [PATCH 116/328] update nginx to 1.15.4

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index d2abff6f..bd22cd0e 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.3
+ARG NGINX_VERSION=1.15.4
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 29f7d5e6..825ea3f1 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.3
+ARG NGINX_VER=1.15.4
 ARG PHP_VER=7.1.22
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 157b96ac..401d2562 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.3
+ARG NGINX_VER=1.15.4
 ARG PHP_VER=7.2.10
 ARG LIBICONV_VERSION=1.15
 

From 5c35737b3f539c6d1e458052afb8e6172679d397 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Wed, 26 Sep 2018 08:40:06 +0200
Subject: [PATCH 117/328] fix dynamic tls patch for boring-nginx

---
 boring-nginx/dynamic_records.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/boring-nginx/dynamic_records.patch b/boring-nginx/dynamic_records.patch
index 6ec15bd4..1b212e0a 100644
--- a/boring-nginx/dynamic_records.patch
+++ b/boring-nginx/dynamic_records.patch
@@ -27,7 +27,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
 
 --- a/src/event/ngx_event_openssl.c
 +++ b/src/event/ngx_event_openssl.c
-@@ -1239,6 +1239,7 @@
+@@ -1267,6 +1267,7 @@
  
      sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
      sc->buffer_size = ssl->buffer_size;
@@ -35,7 +35,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  
      sc->session_ctx = ssl->ctx;
  
-@@ -1806,6 +1807,41 @@
+@@ -2115,6 +2116,41 @@
  
      for ( ;; ) {
  
@@ -77,7 +77,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
          while (in && buf->last < buf->end && send < limit) {
              if (in->buf->last_buf || in->buf->flush) {
                  flush = 1;
-@@ -1907,6 +1643,9 @@
+@@ -2222,6 +2258,9 @@
  
      if (n > 0) {
  
@@ -109,10 +109,10 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  };
  
  
-@@ -93,6 +102,10 @@
-     unsigned                    no_wait_shutdown:1;
-     unsigned                    no_send_shutdown:1;
-     unsigned                    handshake_buffer_set:1;
+@@ -98,6 +107,10 @@
+     unsigned                    try_early_data:1;
+     unsigned                    in_early:1;
+     unsigned                    early_preread:1;
 +
 +    ngx_ssl_dyn_rec_t           dyn_rec;
 +    ngx_msec_t                  dyn_rec_last_write;
@@ -120,7 +120,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  };
  
  
-@@ -102,7 +115,7 @@
+@@ -107,7 +120,7 @@
  #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
  
  

From 0e60b8bc08d0e075df7fb09b36873d0994071798 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 3 Oct 2018 13:57:47 +0200
Subject: [PATCH 118/328] update nginx to 1.15.5

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index bd22cd0e..c3e742f7 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.4
+ARG NGINX_VERSION=1.15.5
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 825ea3f1..78e1cb9c 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.4
+ARG NGINX_VER=1.15.5
 ARG PHP_VER=7.1.22
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 401d2562..60b00fcf 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.4
+ARG NGINX_VER=1.15.5
 ARG PHP_VER=7.2.10
 ARG LIBICONV_VERSION=1.15
 

From 639935ac9497d34154bb129e2f821ba60c27df52 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 12 Oct 2018 15:43:42 +0200
Subject: [PATCH 119/328] update all nextcloud versions and php

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/Dockerfile.14.0 | 2 +-
 nginx-php/Dockerfile.7.1  | 2 +-
 nginx-php/Dockerfile.7.2  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 72816a65..61d2fb83 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.11
+ARG NEXTCLOUD_VERSION=12.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 9827cfa1..3915dff3 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.6
+ARG NEXTCLOUD_VERSION=13.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 358af8d3..b458c228 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.1
+ARG NEXTCLOUD_VERSION=14.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 78e1cb9c..6d8a263c 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.5
-ARG PHP_VER=7.1.22
+ARG PHP_VER=7.1.23
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 60b00fcf..aa48396e 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.5
-ARG PHP_VER=7.2.10
+ARG PHP_VER=7.2.11
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From c9345af78242f71c9cb44297004324a3be02b65e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 18 Oct 2018 13:30:33 +0200
Subject: [PATCH 120/328] update matomo to 3.6.1

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index f53c38ab..9d48757f 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.6.0
+ARG VERSION=3.6.1
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 802357d0db9412307f031f216e0edc37c09c7324 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 31 Oct 2018 10:59:42 +0100
Subject: [PATCH 121/328] fix warning in nextcloud setup check

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 24947e5b..6a7cb583 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -19,11 +19,11 @@ server {
         }
 
         location = /.well-known/carddav {
-            return 301 $scheme://$host/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location = /.well-known/caldav {
-            return 301 $scheme://$host/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location / {

From 0de180e9655dad838cee27c57efbe8b99ed14fb4 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 6 Nov 2018 17:06:53 +0100
Subject: [PATCH 122/328] update nginx to 1.15.6

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index c3e742f7..1721b692 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.5
+ARG NGINX_VERSION=1.15.6
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 6d8a263c..b6d274b1 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.5
+ARG NGINX_VER=1.15.6
 ARG PHP_VER=7.1.23
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index aa48396e..5b1ebc4a 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.5
+ARG NGINX_VER=1.15.6
 ARG PHP_VER=7.2.11
 ARG LIBICONV_VERSION=1.15
 

From 679bcbee6000ca3b95ee7e0f8075f45940fb8b8c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 8 Nov 2018 13:52:10 +0100
Subject: [PATCH 123/328] update nginx to 7.2.12 and 7.1.24

---
 nginx-php/Dockerfile.7.1 | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index b6d274b1..498918f3 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.1.23
+ARG PHP_VER=7.1.24
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 5b1ebc4a..3c7605f1 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.2.11
+ARG PHP_VER=7.2.12
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 5600fcb7e2a040b48a29b5a9a0d0f90d5e1b47c6 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 13 Nov 2018 11:00:36 +0100
Subject: [PATCH 124/328] add nextcloud v15.0-beta1

---
 nextcloud/Dockerfile.15.0 | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 nextcloud/Dockerfile.15.0

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
new file mode 100644
index 00000000..4c0941d1
--- /dev/null
+++ b/nextcloud/Dockerfile.15.0
@@ -0,0 +1,76 @@
+FROM hoellen/nginx-php:7.2
+
+ARG NEXTCLOUD_VERSION=15.0.0beta1
+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/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From 3a3cbda096ed5bffb8a27c939c46accf18317d1a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 15 Nov 2018 19:31:59 +0100
Subject: [PATCH 125/328] update nextcloud to 15.0-beta2

---
 nextcloud/Dockerfile.15.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 4c0941d1..f9430705 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=15.0.0beta1
+ARG NEXTCLOUD_VERSION=15.0.0beta2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 4ae8391af6b0a328381dc0bf4927a4001efa9061 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 19 Nov 2018 13:19:50 +0100
Subject: [PATCH 126/328] update matomo to 3.7.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 9d48757f..e5215af8 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.6.1
+ARG VERSION=3.7.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 094f93474f858f60385ce2aa330d16aa6bb71665 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 22 Nov 2018 15:34:39 +0100
Subject: [PATCH 127/328] update nextcloud to 12.0.13, 13.0.8, 14.0.4 and
 15.0.0RC1

---
 nextcloud/Dockerfile.12.0 | 2 +-
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
index 61d2fb83..c3762b13 100644
--- a/nextcloud/Dockerfile.12.0
+++ b/nextcloud/Dockerfile.12.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.1
 
-ARG NEXTCLOUD_VERSION=12.0.12
+ARG NEXTCLOUD_VERSION=12.0.13
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 3915dff3..ce928662 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.7
+ARG NEXTCLOUD_VERSION=13.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index b458c228..153fba66 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.3
+ARG NEXTCLOUD_VERSION=14.0.4
 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 f9430705..a9d10494 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=15.0.0beta2
+ARG NEXTCLOUD_VERSION=15.0.0RC1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From be82d3574e80aeb083fcc0932de15cdd29ddd2e3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 27 Nov 2018 13:27:54 +0100
Subject: [PATCH 128/328] fix build error for searx

---
 searx/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index 029c6e33..f110bce8 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -25,6 +25,7 @@ RUN apk -U upgrade \
     py2-pip \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
+ && pip install --upgrade pip \
  && pip install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \

From 6eede5512dc60c71c716a458d2055198edbb67b2 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 30 Nov 2018 20:24:26 +0100
Subject: [PATCH 129/328] update nextcloud to 15.0.0-RC2

---
 nextcloud/Dockerfile.15.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index a9d10494..7a27e542 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=15.0.0RC1
+ARG NEXTCLOUD_VERSION=15.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From f911f23c8d802e4b531a989d32a68b1216432b53 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 6 Dec 2018 17:38:28 +0100
Subject: [PATCH 130/328] add new php version 7.3.0 and update to 7.2.13 and
 7.1.25. PHP 7.1 will be removed with the release of nextcloud 15.

---
 nginx-php/Dockerfile.7.1 |   2 +-
 nginx-php/Dockerfile.7.2 |   2 +-
 nginx-php/Dockerfile.7.3 | 180 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 nginx-php/Dockerfile.7.3

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
index 498918f3..6d6de90c 100644
--- a/nginx-php/Dockerfile.7.1
+++ b/nginx-php/Dockerfile.7.1
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.1.24
+ARG PHP_VER=7.1.25
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 3c7605f1..4c3493ff 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.2.12
+ARG PHP_VER=7.2.13
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
new file mode 100644
index 00000000..8fecc178
--- /dev/null
+++ b/nginx-php/Dockerfile.7.3
@@ -0,0 +1,180 @@
+FROM alpine:3.8
+
+ARG BUILD_CORES
+
+ARG NGINX_VER=1.15.6
+ARG PHP_VER=7.3.0
+ARG LIBICONV_VERSION=1.15
+
+LABEL description="nginx + php image based on Alpine" \
+      maintainer="hoellen info@hoellen.eu" \
+      php_version="PHP v$PHP_VER built from source" \
+      nginx_version="nginx v$NGINX_VER built from source"
+
+ARG PHP_MIRROR=http://ch1.php.net
+
+ARG NGINX_CONF=" \
+    --prefix=/nginx \
+    --sbin-path=/usr/local/sbin/nginx \
+    --http-log-path=/nginx/logs/access.log \
+    --error-log-path=/nginx/logs/error.log \
+    --pid-path=/nginx/run/nginx.pid \
+    --lock-path=/nginx/run/nginx.lock \
+    --with-threads \
+    --with-file-aio \
+    --without-http_geo_module \
+    --without-http_autoindex_module \
+    --without-http_split_clients_module \
+    --without-http_memcached_module \
+    --without-http_empty_gif_module \
+    --without-http_browser_module"
+
+ARG PHP_CONF=" \
+    --prefix=/usr \
+    --libdir=/usr/lib/php \
+    --datadir=/usr/share/php \
+    --sysconfdir=/php/etc \
+    --localstatedir=/php/var \
+    --with-pear=/usr/share/php \
+    --with-config-file-scan-dir=/php/conf.d \
+    --with-config-file-path=/php \
+    --with-pic \
+    --disable-short-tags \
+    --without-readline \
+    --enable-bcmath=shared \
+    --enable-fpm \
+    --disable-cgi \
+    --enable-mysqlnd \
+    --enable-mbstring \
+    --with-curl \
+    --with-libedit \
+    --with-openssl \
+    --with-iconv=/usr/local \
+    --with-gd \
+    --with-jpeg-dir \
+    --with-png-dir \
+    --with-webp-dir \
+    --with-xpm-dir=no \
+    --with-freetype-dir \
+    --disable-gd-jis-conv \
+    --with-zlib"
+
+ARG PHP_EXT_LIST=" \
+    mysqli \
+    ctype \
+    dom \
+    json \
+    xml \
+    mbstring \
+    posix \
+    xmlwriter \
+    zip \
+    zlib \
+    sqlite3 \
+    pdo_sqlite \
+    pdo_pgsql \
+    pdo_mysql \
+    pcntl \
+    curl \
+    fileinfo \
+    bz2 \
+    intl \
+    openssl \
+    ldap \
+    simplexml \
+    pgsql \
+    ftp \
+    exif \
+    gmp \
+    imap"
+
+ARG CUSTOM_BUILD_PKGS=" \
+    freetype-dev \
+    openldap-dev \
+    gmp-dev \
+    icu-dev \
+    postgresql-dev \
+    libpng-dev \
+    libwebp-dev \
+    gd-dev \
+    libjpeg-turbo-dev \
+    libxpm-dev \
+    libedit-dev \
+    libxml2-dev \
+    libressl-dev \
+    libbz2 \
+    sqlite-dev \
+    imap-dev"
+
+ARG CUSTOM_PKGS=" \
+    freetype \
+    openldap \
+    gmp \
+    bzip2-dev \
+    icu \
+    libpq \
+    c-client"
+
+COPY rootfs /
+
+RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
+ && BUILD_DEPS=" \
+    linux-headers \
+    libtool \
+    build-base \
+    pcre-dev \
+    zlib-dev \
+    wget \
+    gnupg \
+    autoconf \
+    gcc \
+    g++ \
+    libc-dev \
+    make \
+    pkgconf \
+    curl-dev \
+    ca-certificates \
+    ${CUSTOM_BUILD_PKGS}" \
+ && apk -U add \
+    ${BUILD_DEPS} \
+    s6 \
+    su-exec \
+    curl \
+    libedit \
+    libxml2 \
+    libressl \
+    libwebp \
+    gd \
+    pcre \
+    zlib \
+    ${CUSTOM_PKGS} \
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz.asc/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz.asc \
+ && wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz -O /tmp/libiconv-${LIBICONV_VERSION}.tar.gz \
+ && mkdir -p /php/conf.d \
+ && mkdir -p /usr/src \
+ && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
+ && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
+ && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
+ && cd /usr/src/nginx-${NGINX_VER} \
+ && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+ && cd /usr/src/libiconv-${LIBICONV_VERSION} \
+ && ./configure --prefix=/usr/local \
+ && make && make install && libtool --finish /usr/local/lib \
+ && mv /usr/src/php-${PHP_VER} /usr/src/php \
+ && cd /usr/src/php \
+ && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
+ && make clean \
+ && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
+ && sleep 1 \
+ && docker-php-ext-install ${PHP_EXT_LIST} \
+ && apk del ${BUILD_DEPS} \
+ && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
+ && mkdir -p /nginx/logs /nginx/run /php/php-fpm.d /php/logs /php/run /php/session

From 190a3e9e8093eb95a4d122ae7f99ad207341a188 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 6 Dec 2018 23:06:55 +0100
Subject: [PATCH 131/328] update nextcloud to 15.0.0-RC3

---
 nextcloud/Dockerfile.15.0 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 7a27e542..b693e72a 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
-FROM hoellen/nginx-php:7.2
+FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=15.0.0RC2
+ARG NEXTCLOUD_VERSION=15.0.0RC3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From d7b87e5ffb06c14dfedfdb8523aae57b20be1f0d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 7 Dec 2018 00:04:26 +0100
Subject: [PATCH 132/328] revert nextcloud 15.0 to php 7.2

---
 nextcloud/Dockerfile.15.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index b693e72a..6c8b90dd 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.3
+FROM hoellen/nginx-php:7.2
 
 ARG NEXTCLOUD_VERSION=15.0.0RC3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

From 17225d4aca2f7ead33dc6d52608b18e25cb99292 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 10 Dec 2018 12:11:41 +0100
Subject: [PATCH 133/328] update nextcloud to final release 15.0.0

---
 nextcloud/Dockerfile.15.0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 6c8b90dd..a5a9a2e9 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=15.0.0RC3
+ARG NEXTCLOUD_VERSION=15.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -43,9 +43,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From 30922ce47ef4712fe1de8062e9c086e57ce5ccc0 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 10 Dec 2018 13:24:16 +0100
Subject: [PATCH 134/328] remove nextcloud 12.0 (EOL)

---
 nextcloud/Dockerfile.12.0 | 76 ---------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.12.0

diff --git a/nextcloud/Dockerfile.12.0 b/nextcloud/Dockerfile.12.0
deleted file mode 100644
index c3762b13..00000000
--- a/nextcloud/Dockerfile.12.0
+++ /dev/null
@@ -1,76 +0,0 @@
-FROM hoellen/nginx-php:7.1
-
-ARG NEXTCLOUD_VERSION=12.0.13
-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"]

From b8e5cb5e0b9d2c600e6c7f96c205e25017ee7b7e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 10 Dec 2018 13:39:26 +0100
Subject: [PATCH 135/328] update nginx config for nextcloud

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 6a7cb583..42139283 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -10,7 +10,9 @@ server {
         add_header X-Robots-Tag none;
         add_header X-Download-Options noopen;
         add_header X-Permitted-Cross-Domain-Policies none;
-        add_header Referrer-Policy "strict-origin";
+        add_header Referrer-Policy no-referrer;
+
+
 
         location = /robots.txt {
             allow all;
@@ -27,7 +29,7 @@ server {
         }
 
         location / {
-            rewrite ^ /index.php$uri;
+            rewrite ^ /index.php$request_uri;
         }
 
         location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
@@ -41,6 +43,7 @@ server {
         location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            fastcgi_hide_header X-Powered-By;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_path_info;
             fastcgi_param modHeadersAvailable true;
@@ -56,21 +59,21 @@ server {
             index index.php;
         }
 
-        location ~* \.(?:css|js)$ {
-            try_files $uri /index.php$uri$is_args$args;
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
+            try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=7200";
             add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
-            add_header X-Frame-Options "SAMEORIGIN";
             add_header X-Content-Type-Options nosniff;
             add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag none;
             add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;
+            add_header Referrer-Policy no-referrer;
             access_log off;
         }
 
-        location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
-            try_files $uri /index.php$uri$is_args$args;
+        location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
+            try_files $uri /index.php$request_uri;
             access_log off;
         }
 }

From 425d82cd8d3525723ada1c80b20e40180a14c12f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 10 Dec 2018 15:59:46 +0100
Subject: [PATCH 136/328] update nextcloud README.md

---
 nextcloud/README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 8e9dabef..e44d6327 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (14.0)
-- **14.0** : latest 14.0.x version (stable)
-- **13.0** : latest 13.0.x version (old stable)
-- **12.0** : latest 12.0.x version (deprecated)
+- **latest** : latest stable version (15.0)
+- **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)
+- ~~**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)
 
@@ -78,7 +79,7 @@ Basically, you can use a database instance running on the host or any other mach
 Pull the image and create a container. `/docker` can be anywhere on your host, this is just an example. Change `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` values (mariadb). You may also want to change UID and GID for Nextcloud, as well as other variables (see *Environment Variables*).
 
 ```
-docker pull hoellen/nextcloud:12.0 && docker pull mariadb:10
+docker pull hoellen/nextcloud:15.0 && docker pull mariadb:10
 
 docker run -d --name db_nextcloud \
        -v /docker/nextcloud/db:/var/lib/mysql \

From db56b159fd0a2ccc026c7fc4f373b7736b0b2bcb Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 10 Dec 2018 16:50:42 +0100
Subject: [PATCH 137/328] add imagemagick to nextcloud 15

---
 nextcloud/Dockerfile.15.0 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index a5a9a2e9..5cedbc61 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -29,17 +29,21 @@ RUN apk -U upgrade \
     pcre-dev \
     libtool \
     samba-dev \
+    imagemagick-dev \
  && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
+    imagemagick-libs \
     tzdata \
  && pecl install \
     smbclient \
     apcu \
     redis \
+    imagick \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \

From f9e5ab0beb8470a6c255884d2370b7b46bb3e3de Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 12 Dec 2018 11:39:51 +0100
Subject: [PATCH 138/328] Add missing service discovery in nginx config

See https://docs.nextcloud.com/server/15/admin_manual/issues/general_troubleshooting.html#service-discovery
Rules as suggest in https://docs.nextcloud.com/server/15/admin_manual/installation/nginx.html
---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 42139283..401c1a46 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -20,6 +20,10 @@ server {
             access_log off;
         }
 
+        rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+        rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+        rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
+
         location = /.well-known/carddav {
             return 301 https://$host/remote.php/dav;
         }

From 93678cee18317a2aa2fc767dc02035712516f466 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 25 Dec 2018 11:43:35 +0100
Subject: [PATCH 139/328] use php 7.3 for nextcloud 15 (php-smbclient is now
 available for php 7.3

---
 nextcloud/Dockerfile.15.0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 5cedbc61..a0e52963 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.2
+FROM hoellen/nginx-php:7.3
 
 ARG NEXTCLOUD_VERSION=15.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
@@ -36,6 +36,7 @@ RUN apk -U upgrade \
     libsmbclient \
     imagemagick-libs \
     tzdata \
+ && pecl channel-update pecl.php.net \
  && pecl install \
     smbclient \
     apcu \

From 09ca44c0ee662b60c20aff1700906f0b739fa20e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 25 Dec 2018 23:29:44 +0100
Subject: [PATCH 140/328] fix boring-nginx build error

---
 boring-nginx/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 1721b692..88c2c17f 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -64,9 +64,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && cd /tmp && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \
  && git clone https://boringssl.googlesource.com/boringssl --depth=1 \
  && cd boringssl \
- && sed -i 's@\$shaext[ ]*=[ ]*0;@\$shaext = 1;@' crypto/*/*/asm/*.pl \
- && sed -i 's@\$avx[ ]*=[ ]*[0|1];@\$avx = 2;@' crypto/*/*/asm/*.pl \
- && sed -i 's@\$addx[ ]*=[ ]*0;@\$addx = 1;@' crypto/*/*/asm/*.pl \
  && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. \
  && make -j ${NB_CORES} && cd .. \
  && mkdir -p .openssl/lib/ && cd .openssl && ln -s ../include && cd .. \

From 0d2c24a661e2a7902d6714149d7f65718e129755 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 26 Dec 2018 09:11:58 +0100
Subject: [PATCH 141/328] fix build error php 7.3 (libzip)

---
 nginx-php/Dockerfile.7.3 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 8fecc178..e8cfefc7 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -124,6 +124,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     build-base \
     pcre-dev \
     zlib-dev \
+    libzip-dev \
     wget \
     gnupg \
     autoconf \

From 4f089247be20ca67a80a979e8e5fdf97e071f92c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 26 Dec 2018 12:25:15 +0100
Subject: [PATCH 142/328] enable imagick for nextcloud daily

---
 nextcloud/Dockerfile.daily | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index c562757d..cab7ec5b 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -14,6 +14,7 @@ ENV UID=991 GID=991 \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost
+    CHECK_PERMISSIONS=1
 
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
@@ -25,17 +26,22 @@ RUN apk -U upgrade \
     pcre-dev \
     libtool \
     samba-dev \
+    imagemagick-dev \
  && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
+    imagemagick-libs \
     tzdata \
+ && pecl channel-update pecl.php.net \
  && pecl install \
     smbclient \
     apcu \
     redis \
+    imagick \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
  && mkdir /nextcloud \
  && cd /tmp \
  && wget -q https://download.nextcloud.com/server/daily/latest.tar.bz2 \

From 1d2fecc25053ed3214ea575c33697dc25d975ad4 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 26 Dec 2018 12:26:26 +0100
Subject: [PATCH 143/328] revert php for nextcloud 15 (php 7.2).

---
 nextcloud/Dockerfile.15.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index a0e52963..496606d4 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.3
+FROM hoellen/nginx-php:7.2
 
 ARG NEXTCLOUD_VERSION=15.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

From b5b5c39afa55d54d780f9b2fa954cb7f8bc3a60d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 26 Dec 2018 13:02:11 +0100
Subject: [PATCH 144/328] fix typo

---
 nextcloud/Dockerfile.daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index cab7ec5b..626b9f4a 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -13,7 +13,7 @@ ENV UID=991 GID=991 \
     CRON_MEMORY_LIMIT=1g \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
-    DOMAIN=localhost
+    DOMAIN=localhost \
     CHECK_PERMISSIONS=1
 
 RUN apk -U upgrade \

From b160d73ba7086c5bfae2abd249055f064385e488 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 27 Dec 2018 21:11:33 +0100
Subject: [PATCH 145/328] PHP zip extension needs libzip.so.5 at runtime
 (Fixes: #17)

---
 nginx-php/Dockerfile.7.3 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index e8cfefc7..c2971619 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -145,6 +145,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     libxml2 \
     libressl \
     libwebp \
+    libzip \
     gd \
     pcre \
     zlib \

From cd303fb2ee2a46c37d44538c920ced97c19550ea Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 28 Dec 2018 22:07:25 +0100
Subject: [PATCH 146/328] update nextcloud 15 to php 7.3

---
 nextcloud/Dockerfile.15.0  | 2 +-
 nextcloud/Dockerfile.daily | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 496606d4..a0e52963 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.2
+FROM hoellen/nginx-php:7.3
 
 ARG NEXTCLOUD_VERSION=15.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 626b9f4a..0937e12a 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.2
+FROM hoellen/nginx-php:7.3
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \

From 49137cc2b3e1265787657afa343e16915bfd5ecc Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 29 Dec 2018 09:00:17 +0100
Subject: [PATCH 147/328] update README

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index e44d6327..41789b32 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -8,7 +8,7 @@
 ### Features
 - Based on wonderfall/dockerfiles (Thanks!)
 - Based on Alpine Linux.
-- Bundled with nginx and PHP 7.2 (hoellen/nginx-php image).
+- Bundled with nginx and PHP 7.3 (hoellen/nginx-php image).
 - Automatic installation using environment variables.
 - Package integrity (SHA512) and authenticity (PGP) checked during building process.
 - Data and apps persistence.

From 51f0657433b0dafe8af9ace2fb4d564ff96f8487 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 6 Jan 2019 23:01:32 +0100
Subject: [PATCH 148/328] update searx to 0.15.0

---
 searx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index f110bce8..3da9ed8d 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.8
 
-ARG VERSION=0.14.0
+ARG VERSION=0.15.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991

From 68e997244c6737f9c72db32d677f5db1bddee170 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Tue, 8 Jan 2019 09:16:15 +0100
Subject: [PATCH 149/328] Disable fastcgi_intercept_errors to fix CARDDAV on
 OSX.

Multiple addressbooks seems to be challenging on OSX. This should make it
work again as described in
https://github.com/nextcloud/contacts/issues/399#issuecomment-451651613
---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 401c1a46..21b6258a 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -53,7 +53,7 @@ server {
             fastcgi_param modHeadersAvailable true;
             fastcgi_param front_controller_active true;
             fastcgi_pass unix:/php/run/php-fpm.sock;
-            fastcgi_intercept_errors on;
+            fastcgi_intercept_errors off;
             fastcgi_request_buffering off;
             fastcgi_read_timeout 1200;
         }

From 3548dcfae6ed4526e9a70aa722b8f093559c82c9 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 10 Jan 2019 19:57:05 +0100
Subject: [PATCH 150/328] update PHP to 7.3.1 and 7.2.14. Remove PHP 7.1

---
 nginx-php/Dockerfile.7.1 | 184 ---------------------------------------
 nginx-php/Dockerfile.7.2 |   2 +-
 nginx-php/Dockerfile.7.3 |   2 +-
 3 files changed, 2 insertions(+), 186 deletions(-)
 delete mode 100644 nginx-php/Dockerfile.7.1

diff --git a/nginx-php/Dockerfile.7.1 b/nginx-php/Dockerfile.7.1
deleted file mode 100644
index 6d6de90c..00000000
--- a/nginx-php/Dockerfile.7.1
+++ /dev/null
@@ -1,184 +0,0 @@
-FROM alpine:3.8
-
-ARG BUILD_CORES
-
-ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.1.25
-ARG LIBICONV_VERSION=1.15
-
-LABEL description="nginx + php image based on Alpine" \
-      maintainer="hoellen info@hoellen.eu" \
-      php_version="PHP v$PHP_VER built from source" \
-      nginx_version="nginx v$NGINX_VER built from source"
-
-ARG PHP_MIRROR=http://ch1.php.net
-
-ARG NGINX_CONF=" \
-    --prefix=/nginx \
-    --sbin-path=/usr/local/sbin/nginx \
-    --http-log-path=/nginx/logs/access.log \
-    --error-log-path=/nginx/logs/error.log \
-    --pid-path=/nginx/run/nginx.pid \
-    --lock-path=/nginx/run/nginx.lock \
-    --with-threads \
-    --with-file-aio \
-    --without-http_geo_module \
-    --without-http_autoindex_module \
-    --without-http_split_clients_module \
-    --without-http_memcached_module \
-    --without-http_empty_gif_module \
-    --without-http_browser_module"
-
-ARG PHP_CONF=" \
-    --prefix=/usr \
-    --libdir=/usr/lib/php \
-    --datadir=/usr/share/php \
-    --sysconfdir=/php/etc \
-    --localstatedir=/php/var \
-    --with-pear=/usr/share/php \
-    --with-config-file-scan-dir=/php/conf.d \
-    --with-config-file-path=/php \
-    --with-pic \
-    --disable-short-tags \
-    --without-readline \
-    --enable-bcmath=shared \
-    --enable-fpm \
-    --disable-cgi \
-    --enable-mysqlnd \
-    --enable-mbstring \
-    --with-curl \
-    --with-libedit \
-    --with-openssl \
-    --with-iconv=/usr/local \
-    --with-gd \
-    --with-jpeg-dir \
-    --with-png-dir \
-    --with-webp-dir \
-    --with-xpm-dir=no \
-    --with-freetype-dir \
-    --enable-gd-native-ttf \
-    --disable-gd-jis-conv \
-    --with-zlib"
-
-ARG PHP_EXT_LIST=" \
-    mysqli \
-    ctype \
-    dom \
-    json \
-    xml \
-    mbstring \
-    posix \
-    xmlwriter \
-    zip \
-    zlib \
-    sqlite3 \
-    pdo_sqlite \
-    pdo_pgsql \
-    pdo_mysql \
-    pcntl \
-    curl \
-    fileinfo \
-    bz2 \
-    intl \
-    mcrypt \
-    openssl \
-    ldap \
-    simplexml \
-    pgsql \
-    ftp \
-    exif \
-    gmp \
-    imap"
-
-ARG CUSTOM_BUILD_PKGS=" \
-    freetype-dev \
-    openldap-dev \
-    gmp-dev \
-    libmcrypt-dev \
-    icu-dev \
-    postgresql-dev \
-    libpng-dev \
-    libwebp-dev \
-    gd-dev \
-    libjpeg-turbo-dev \
-    libxpm-dev \
-    libedit-dev \
-    libxml2-dev \
-    libressl-dev \
-    libbz2 \
-    sqlite-dev \
-    imap-dev"
-
-ARG CUSTOM_PKGS=" \
-    freetype \
-    openldap \
-    gmp \
-    libmcrypt \
-    bzip2-dev \
-    icu \
-    libpq \
-    c-client"
-
-COPY rootfs /
-
-RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
- && BUILD_DEPS=" \
-    linux-headers \
-    libtool \
-    build-base \
-    pcre-dev \
-    zlib-dev \
-    wget \
-    gnupg \
-    autoconf \
-    gcc \
-    g++ \
-    libc-dev \
-    make \
-    pkgconf \
-    curl-dev \
-    ca-certificates \
-    ${CUSTOM_BUILD_PKGS}" \
- && apk -U add \
-    ${BUILD_DEPS} \
-    s6 \
-    su-exec \
-    curl \
-    libedit \
-    libxml2 \
-    libressl \
-    libwebp \
-    gd \
-    pcre \
-    zlib \
-    ${CUSTOM_PKGS} \
- && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
- && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
- && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
- && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz.asc/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz.asc \
- && wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz -O /tmp/libiconv-${LIBICONV_VERSION}.tar.gz \
- && mkdir -p /php/conf.d \
- && mkdir -p /usr/src \
- && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
- && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
- && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
- && cd /usr/src/nginx-${NGINX_VER} \
- && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
- && make -j ${NB_CORES} \
- && make install \
- && cd /usr/src/libiconv-${LIBICONV_VERSION} \
- && ./configure --prefix=/usr/local \
- && make && make install && libtool --finish /usr/local/lib \
- && mv /usr/src/php-${PHP_VER} /usr/src/php \
- && cd /usr/src/php \
- && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
- && make -j ${NB_CORES} \
- && make install \
- && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
- && make clean \
- && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
- && sleep 1 \
- && docker-php-ext-install ${PHP_EXT_LIST} \
- && apk del ${BUILD_DEPS} \
- && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
- && mkdir -p /nginx/logs /nginx/run /php/php-fpm.d /php/logs /php/run /php/session
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 4c3493ff..2b8c88fc 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.2.13
+ARG PHP_VER=7.2.14
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index c2971619..3544acdd 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.8
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.3.0
+ARG PHP_VER=7.3.1
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 6d622143186cd513d6d92cd2a8827fabe03275bd Mon Sep 17 00:00:00 2001
From: mwlczk <>
Date: Fri, 11 Jan 2019 18:56:07 +0100
Subject: [PATCH 151/328] bumped all Versions by two

---
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index ce928662..a981dace 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.8
+ARG NEXTCLOUD_VERSION=13.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 153fba66..e711aabb 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.4
+ARG NEXTCLOUD_VERSION=14.0.6
 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 a0e52963..c1576066 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.0
+ARG NEXTCLOUD_VERSION=15.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 969dd3ebd49913a361b7af3f1255b0367f7aa5fe Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 30 Jan 2019 09:50:27 +0100
Subject: [PATCH 152/328] update alpine based image to alpine 3.9

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 searx/Dockerfile         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 88c2c17f..6ad8c994 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 ENV UID=991 GID=991
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 2b8c88fc..3999506c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 3544acdd..651ba656 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 ARG BUILD_CORES
 
diff --git a/searx/Dockerfile b/searx/Dockerfile
index 3da9ed8d..0352d968 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 ARG VERSION=0.15.0
 

From 634bafb4961c33dee582b1993445a3c342020c7e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 1 Feb 2019 09:06:59 +0100
Subject: [PATCH 153/328] disable jemalloc for boring-nginx (alpine doesn't
 support it in 3.9)

---
 boring-nginx/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 6ad8c994..d4274841 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -36,7 +36,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     zlib \
     libgcc \
     libstdc++ \
-    jemalloc \
     su-exec \
     libressl \
     bind-tools \
@@ -48,7 +47,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     automake \
     autoconf \
     git \
-    jemalloc-dev \
     tar \
     libtool \
     pcre-dev \
@@ -86,7 +84,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     --prefix=/etc/nginx \
     --sbin-path=/usr/sbin/nginx \
     --with-cc-opt="-O3 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -Wno-deprecated-declarations -I ../boringssl/.openssl/include/" \
-    --with-ld-opt="-lrt -ljemalloc -Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \
+    --with-ld-opt="-lrt -Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \
     --http-log-path=/var/log/nginx/access.log \
     --error-log-path=/var/log/nginx/error.log \
     ${NGINX_MODULES} \

From 7e0b8588c4dd870231d0adb53245d4d5ad4b34d1 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 1 Feb 2019 09:25:01 +0100
Subject: [PATCH 154/328] upgrade python to version 3 in searx image and fix
 build error

---
 searx/Dockerfile | 10 +++++-----
 searx/run.sh     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index 0352d968..65cec3b5 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -8,7 +8,7 @@ ENV BASE_URL=False IMAGE_PROXY=False \
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
     build-base \
-    python-dev \
+    python3-dev \
     libffi-dev \
     libxslt-dev \
     libxml2-dev \
@@ -17,16 +17,16 @@ RUN apk -U upgrade \
     ca-certificates \
  && apk add \
     su-exec \
-    python \
+    python3 \
     libxml2 \
     libxslt \
     openssl \
     tini \
-    py2-pip \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
- && pip install --upgrade pip \
- && pip install --no-cache -r requirements.txt \
+ && pip3 install --upgrade pip \
+ && pip3 install --upgrade setuptools pip==18.1 #pip=18.1 because of pypa/pip#6197 \
+ && pip3 install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \
  && rm -f /var/cache/apk/*
diff --git a/searx/run.sh b/searx/run.sh
index bb275ff0..f65723c6 100644
--- a/searx/run.sh
+++ b/searx/run.sh
@@ -4,4 +4,4 @@ sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \
        -e "s/ultrasecretkey/$(openssl rand -hex 16)/g" \
        /usr/local/searx/searx/settings.yml
 
-exec su-exec $UID:$GID /sbin/tini -- python /usr/local/searx/searx/webapp.py
+exec su-exec $UID:$GID /sbin/tini -- python3 /usr/local/searx/searx/webapp.py

From 89c9e4f9b135b6439744df52bd2c21902ae80260 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 1 Feb 2019 09:39:58 +0100
Subject: [PATCH 155/328] use openssl for nginx-php (alpine 3.9)

---
 nginx-php/Dockerfile.7.2 | 4 ++--
 nginx-php/Dockerfile.7.3 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 3999506c..cf08877c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -101,7 +101,7 @@ ARG CUSTOM_BUILD_PKGS=" \
     libxpm-dev \
     libedit-dev \
     libxml2-dev \
-    libressl-dev \
+    openssl-dev \
     libbz2 \
     sqlite-dev \
     imap-dev"
@@ -142,7 +142,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     curl \
     libedit \
     libxml2 \
-    libressl \
+    openssl \
     libwebp \
     gd \
     pcre \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 651ba656..a767aad8 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -101,7 +101,7 @@ ARG CUSTOM_BUILD_PKGS=" \
     libxpm-dev \
     libedit-dev \
     libxml2-dev \
-    libressl-dev \
+    openssl-dev \
     libbz2 \
     sqlite-dev \
     imap-dev"
@@ -143,7 +143,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     curl \
     libedit \
     libxml2 \
-    libressl \
+    openssl \
     libwebp \
     libzip \
     gd \

From ac25c079ca671c0f9d9f6d7e672a75dfb7158cfb Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 1 Feb 2019 14:48:13 +0100
Subject: [PATCH 156/328] remove comment

---
 searx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index 65cec3b5..fef9fa55 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -25,7 +25,7 @@ RUN apk -U upgrade \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
  && pip3 install --upgrade pip \
- && pip3 install --upgrade setuptools pip==18.1 #pip=18.1 because of pypa/pip#6197 \
+ && pip3 install --upgrade setuptools pip==18.1 \
  && pip3 install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \

From f992108336b6452c52e0db992dcd1a8a98c29125 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 5 Feb 2019 22:04:19 +0100
Subject: [PATCH 157/328] update php to 7.3.2 and 7.2.15

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index cf08877c..a8187b40 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.2.14
+ARG PHP_VER=7.2.15
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index a767aad8..4a357443 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.6
-ARG PHP_VER=7.3.1
+ARG PHP_VER=7.3.2
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 3b5dd65fe7aad165d71211027c707d4aaf32dbf4 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 7 Feb 2019 13:25:15 +0100
Subject: [PATCH 158/328] update nextcloud to 13.0.11, 14.0.7 and 15.0.4

---
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index a981dace..280a3b4d 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.10
+ARG NEXTCLOUD_VERSION=13.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index e711aabb..cae58d76 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.6
+ARG NEXTCLOUD_VERSION=14.0.7
 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 c1576066..da5d0c25 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.2
+ARG NEXTCLOUD_VERSION=15.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From b40212803fb064ef4f09ce12ab2059fcac3577d1 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 7 Feb 2019 19:03:57 +0100
Subject: [PATCH 159/328] update nginx to 1.15.8

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index d4274841..b5666264 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.6
+ARG NGINX_VERSION=1.15.8
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index a8187b40..5f9bbb55 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.6
+ARG NGINX_VER=1.15.8
 ARG PHP_VER=7.2.15
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 4a357443..891d0a44 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.6
+ARG NGINX_VER=1.15.8
 ARG PHP_VER=7.3.2
 ARG LIBICONV_VERSION=1.15
 

From 934ce896fd7100d81ad18f5dc8232bb256b9af37 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 7 Feb 2019 20:17:02 +0100
Subject: [PATCH 160/328] update dynamic_records.patch for boring nginx

---
 boring-nginx/dynamic_records.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boring-nginx/dynamic_records.patch b/boring-nginx/dynamic_records.patch
index 1b212e0a..37dd7570 100644
--- a/boring-nginx/dynamic_records.patch
+++ b/boring-nginx/dynamic_records.patch
@@ -27,7 +27,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
 
 --- a/src/event/ngx_event_openssl.c
 +++ b/src/event/ngx_event_openssl.c
-@@ -1267,6 +1267,7 @@
+@@ -1272,6 +1272,7 @@
  
      sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
      sc->buffer_size = ssl->buffer_size;
@@ -35,7 +35,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  
      sc->session_ctx = ssl->ctx;
  
-@@ -2115,6 +2116,41 @@
+@@ -2124,6 +2125,41 @@
  
      for ( ;; ) {
  
@@ -77,7 +77,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
          while (in && buf->last < buf->end && send < limit) {
              if (in->buf->last_buf || in->buf->flush) {
                  flush = 1;
-@@ -2222,6 +2258,9 @@
+@@ -2231,6 +2272,9 @@
  
      if (n > 0) {
  
@@ -109,10 +109,10 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  };
  
  
-@@ -98,6 +107,10 @@
-     unsigned                    try_early_data:1;
+@@ -99,6 +108,10 @@
      unsigned                    in_early:1;
      unsigned                    early_preread:1;
+     unsigned                    write_blocked:1;
 +
 +    ngx_ssl_dyn_rec_t           dyn_rec;
 +    ngx_msec_t                  dyn_rec_last_write;
@@ -120,7 +120,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
  };
  
  
-@@ -107,7 +120,7 @@
+@@ -108,7 +121,7 @@
  #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
  
  

From 91abfcb7c235d6166ba55764646b5e353a229cad Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Sat, 9 Feb 2019 09:25:08 +0100
Subject: [PATCH 161/328] remove pip downgrade, issue is fixed (pypa/pip#6197)

---
 searx/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/searx/Dockerfile b/searx/Dockerfile
index fef9fa55..af14bcc4 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -24,8 +24,7 @@ RUN apk -U upgrade \
     tini \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
- && pip3 install --upgrade pip \
- && pip3 install --upgrade setuptools pip==18.1 \
+ && pip3 install --upgrade setuptools pip \
  && pip3 install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \

From fa7ed68fa5f5373bca94bb85c79cc6b15d25cb88 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 16 Feb 2019 11:55:02 +0100
Subject: [PATCH 162/328] update readme

---
 nextcloud/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 41789b32..82ef0b81 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -108,7 +108,7 @@ docker run -d --name nextcloud \
        -e DB_USER=nextcloud \
        -e DB_PASSWORD=supersecretpassword \
        -e DB_HOST=db_nextcloud \
-       hoellen/nextcloud:12.0
+       hoellen/nextcloud:15.0
 ```
 
 You are **not obliged** to use `ADMIN_USER` and `ADMIN_PASSWORD`. If these variables are not provided, you'll be able to configure your admin acccount from your browser.
@@ -124,7 +124,7 @@ You will have to build yourself using an Alpine-ARM image, like `orax/alpine-arm
 In the admin panel, you should switch from `AJAX cron` to `cron` (system cron).
 
 ### Update
-Pull a newer image, then recreate the container as you did before (*Setup* step). None of your data will be lost since you're using external volumes. If Nextcloud performed a full upgrade, your apps could be disabled, enable them again **(starting with 12.0.x, your apps are automatically enabled after an upgrade)**.
+Pull a newer image, then recreate the container as you did before (*Setup* step). None of your data will be lost since you're using external volumes. Nextcloud takes care of the database migration steps.
 
 ### Docker-compose
 I advise you to use [docker-compose](https://docs.docker.com/compose/), which is a great tool for managing containers. You can create a `docker-compose.yml` with the following content (which must be adapted to your needs) and then run `docker-compose up -d nextcloud-db`, wait some 15 seconds for the database to come up, then run everything with `docker-compose up -d`, that's it! On subsequent runs,  a single `docker-compose up -d` is sufficient!

From 3dcf5320c0f5b040b073b8b89c29a166ecd9afc0 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 28 Feb 2019 11:56:22 +0100
Subject: [PATCH 163/328] Update nextclout to 13.0.12, 14.0.8 and 15.0.5

---
 nextcloud/Dockerfile.13.0 | 2 +-
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.13.0 b/nextcloud/Dockerfile.13.0
index 280a3b4d..e8498340 100644
--- a/nextcloud/Dockerfile.13.0
+++ b/nextcloud/Dockerfile.13.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG NEXTCLOUD_VERSION=13.0.11
+ARG NEXTCLOUD_VERSION=13.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index cae58d76..a9448561 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.7
+ARG NEXTCLOUD_VERSION=14.0.8
 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 da5d0c25..c757760c 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.4
+ARG NEXTCLOUD_VERSION=15.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From d5ddd8639fdc09bcd94a13668cf64b1448c21395 Mon Sep 17 00:00:00 2001
From: Simon Baerlocher <s.baerlocher@sbaerlocher.ch>
Date: Wed, 6 Mar 2019 10:01:09 +0100
Subject: [PATCH 164/328] add ocm-provider in nginx

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 21b6258a..83366bda 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -44,7 +44,7 @@ server {
             deny all;
         }
 
-        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             fastcgi_hide_header X-Powered-By;
@@ -58,7 +58,7 @@ server {
             fastcgi_read_timeout 1200;
         }
 
-        location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+        location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {
             try_files $uri/ =404;
             index index.php;
         }

From a06b8591732ce91abce607820acc512522e2b53b Mon Sep 17 00:00:00 2001
From: Simon Baerlocher <s.baerlocher@sbaerlocher.ch>
Date: Wed, 6 Mar 2019 10:11:16 +0100
Subject: [PATCH 165/328] remove backslash

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 83366bda..50b486fe 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -44,7 +44,7 @@ server {
             deny all;
         }
 
-        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
+        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|ocm-provider/.+)\.php(?:$|/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             fastcgi_hide_header X-Powered-By;
@@ -58,7 +58,7 @@ server {
             fastcgi_read_timeout 1200;
         }
 
-        location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {
+        location ~ ^/(?:updater|ocs-provider|ocm-provider)(?:$|/) {
             try_files $uri/ =404;
             index index.php;
         }

From 91fada54e7f6e74126f4a4c34b01c505e14c070d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 21 Mar 2019 14:46:24 +0100
Subject: [PATCH 166/328] upadte php to 7.2.16 and 7.3.3

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 5f9bbb55..15fd02ad 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.8
-ARG PHP_VER=7.2.15
+ARG PHP_VER=7.2.16
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 891d0a44..20062531 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.8
-ARG PHP_VER=7.3.2
+ARG PHP_VER=7.3.3
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From f630ac66238983819c1a6f465caa99343f79eb0b Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 26 Mar 2019 15:53:16 +0100
Subject: [PATCH 167/328] update nginx to 1.15.10

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index b5666264..4c1499de 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.8
+ARG NGINX_VERSION=1.15.10
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 15fd02ad..fbbb69a3 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.8
+ARG NGINX_VER=1.15.10
 ARG PHP_VER=7.2.16
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 20062531..505ea98e 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.8
+ARG NGINX_VER=1.15.10
 ARG PHP_VER=7.3.3
 ARG LIBICONV_VERSION=1.15
 

From e5ca67f89079a019d9f59b28f650b3d91025107b Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Tue, 26 Mar 2019 16:00:41 +0100
Subject: [PATCH 168/328] update matomo to 3.9.1

---
 matomo/Dockerfile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index e5215af8..ddd04807 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.2
 
-ARG VERSION=3.7.0
+ARG VERSION=3.9.1
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \
@@ -13,20 +13,13 @@ ENV UID=991 GID=991 \
     PHP_MAX_SPARE_SERVERS=6
 
 RUN BUILD_DEPS=" \
-    git \
     tar \
-    build-base \
-    autoconf \
-    geoip-dev \
-    libressl \
+    openssl \
     ca-certificates \
     gnupg" \
  && apk -U upgrade && apk add \
     ${BUILD_DEPS} \
-    geoip \
     tzdata \
- && pecl install geoip-1.1.1 \
- && echo 'extension=geoip.so' >> /php/conf.d/geoip.ini \
  && mkdir /matomo && cd /tmp \
  && MATOMO_TARBALL="matomo-${VERSION}.tar.gz" \
  && wget -q https://builds.matomo.org/${MATOMO_TARBALL} \
@@ -40,9 +33,7 @@ RUN BUILD_DEPS=" \
  && if [ "${FINGERPRINT}" != "${GPG_matthieu}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${MATOMO_TARBALL}..." \
  && tar xzf ${MATOMO_TARBALL} --strip 1 -C /matomo \
- && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /usr/share/GeoIP/ \
- && gzip -d /usr/share/GeoIP/GeoLiteCity.dat.gz \
- && mv /usr/share/GeoIP/GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat \
+ && cd /matomo/misc && wget -qO- https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz | tar xz --strip 1 \
  && apk del ${BUILD_DEPS} php7-dev php7-pear \
  && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
 

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 169/328] 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 e8498340..00000000
--- 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 a9448561..1cd6ad8a 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 c757760c..3061ce87 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 82ef0b81..2a5042a6 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)

From 709e49774e671639a06704461bb76dec419ca241 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Apr 2019 15:39:47 +0200
Subject: [PATCH 170/328] update php to 7.2.17 and 7.3.4

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index fbbb69a3..2c742fb8 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.10
-ARG PHP_VER=7.2.16
+ARG PHP_VER=7.2.17
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 505ea98e..c39bdd46 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.10
-ARG PHP_VER=7.3.3
+ARG PHP_VER=7.3.4
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From f246155124f924fa07fb8c1a77f90e8c677ff52a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 9 Apr 2019 14:31:22 +0200
Subject: [PATCH 171/328] update nextcloud to 14.0.10 and 15.0.7

---
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 1cd6ad8a..77e82087 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.9
+ARG NEXTCLOUD_VERSION=14.0.10
 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 3061ce87..5a89ed88 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.6
+ARG NEXTCLOUD_VERSION=15.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 3e59eb5899368cf2ebacc203dfd54355bb18af5f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 9 Apr 2019 15:46:44 +0200
Subject: [PATCH 172/328] update nginx to 1.15.11

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 4c1499de..194e55ac 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.10
+ARG NGINX_VERSION=1.15.11
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 2c742fb8..3b5f9bb5 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.10
+ARG NGINX_VER=1.15.11
 ARG PHP_VER=7.2.17
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index c39bdd46..e9265b4b 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.10
+ARG NGINX_VER=1.15.11
 ARG PHP_VER=7.3.4
 ARG LIBICONV_VERSION=1.15
 

From 941633592763a8a1ceab8678e8fdeeb11278cb66 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 12 Apr 2019 10:49:07 +0200
Subject: [PATCH 173/328] combine ocm-provider and ocs-provider

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 50b486fe..d00377ae 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -44,7 +44,7 @@ server {
             deny all;
         }
 
-        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|ocm-provider/.+)\.php(?:$|/) {
+        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(?:$|/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             fastcgi_hide_header X-Powered-By;
@@ -58,7 +58,7 @@ server {
             fastcgi_read_timeout 1200;
         }
 
-        location ~ ^/(?:updater|ocs-provider|ocm-provider)(?:$|/) {
+        location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
             try_files $uri/ =404;
             index index.php;
         }

From 9ae3e67fb536dac8dca15f9138158f83bb7cbdc6 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 12 Apr 2019 10:58:44 +0200
Subject: [PATCH 174/328] add Nextcloud 16.0 RC1

---
 nextcloud/Dockerfile.16.0 | 81 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 nextcloud/Dockerfile.16.0

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
new file mode 100644
index 00000000..a1f8a61e
--- /dev/null
+++ b/nextcloud/Dockerfile.16.0
@@ -0,0 +1,81 @@
+FROM hoellen/nginx-php:7.3
+
+ARG NEXTCLOUD_VERSION=16.0.0RC1
+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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick-libs \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
+ && mkdir /nextcloud \
+ && cd /tmp \
+ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From d66026493c6be4c092f6ae6e4a777e044fa5117c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 16 Apr 2019 17:38:29 +0200
Subject: [PATCH 175/328] update nginx to 1.15.12

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 3b5f9bb5..e8bfe32f 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.11
+ARG NGINX_VER=1.15.12
 ARG PHP_VER=7.2.17
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index e9265b4b..f0abaca2 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.11
+ARG NGINX_VER=1.15.12
 ARG PHP_VER=7.3.4
 ARG LIBICONV_VERSION=1.15
 

From 8c30a9b0c5196fbc03b21b1b221226ce954699f5 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Thu, 18 Apr 2019 08:25:52 +0200
Subject: [PATCH 176/328] Update Nextcloud to 16.0-RC2

---
 nextcloud/Dockerfile.16.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index a1f8a61e..962e0891 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.0RC1
+ARG NEXTCLOUD_VERSION=16.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 2471d011dc00bf8c67fed8547eaf7811dc281ee4 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 25 Apr 2019 11:27:00 +0200
Subject: [PATCH 177/328] update Nextcloud to final 16.0

---
 nextcloud/Dockerfile.16.0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 962e0891..b1aa2996 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.0RC2
+ARG NEXTCLOUD_VERSION=16.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -48,9 +48,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From e4afdbd43e76494fe9410d085fe542c4860f1e88 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 25 Apr 2019 11:28:08 +0200
Subject: [PATCH 178/328] update nginx to 1.15.12

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 194e55ac..f35fbbf6 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.11
+ARG NGINX_VERSION=1.15.12
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 

From 205b91260930d22ae5fc3cd7dc6ecb18318fcaab Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 2 May 2019 11:36:21 +0200
Subject: [PATCH 179/328] update php to 7.2.18 and 7.3.5

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index e8bfe32f..83bebf4d 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.12
-ARG PHP_VER=7.2.17
+ARG PHP_VER=7.2.18
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index f0abaca2..3d0d83d6 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.15.12
-ARG PHP_VER=7.3.4
+ARG PHP_VER=7.3.5
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From d629756a20eac7bbebaa228774b5642f6014e749 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 14 May 2019 09:56:21 +0200
Subject: [PATCH 180/328] update README

---
 nextcloud/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 2a5042a6..85060085 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -76,6 +76,8 @@ Don't forget to use a **strong password** for the admin account!
 ### Database
 Basically, you can use a database instance running on the host or any other machine. An easier solution is to use an external database container. I suggest you to use MariaDB, which is a reliable database server. You can use the official `mariadb` image available on Docker Hub to create a database container, which must be linked to the Nextcloud container. PostgreSQL can also be used as well.
 
+Please note, that you may need to adjust some database settings to your hardware to achieve better performance for your Nextcloud instance. Some examples can be found in the [Nextcloud documentation](https://docs.nextcloud.com/server/16/admin_manual/configuration_database/linux_database_configuration.html).
+
 ### Setup
 Pull the image and create a container. `/docker` can be anywhere on your host, this is just an example. Change `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` values (mariadb). You may also want to change UID and GID for Nextcloud, as well as other variables (see *Environment Variables*).
 

From f8b043c016e8cfd1cd8acbd6f8d4c99a57fed31b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 May 2019 11:19:56 +0200
Subject: [PATCH 181/328] update Nextcloud to 14.0.11, 15.0.8 and 16.0.1

---
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 77e82087..536e7e90 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.10
+ARG NEXTCLOUD_VERSION=14.0.11
 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 5a89ed88..7df123be 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.7
+ARG NEXTCLOUD_VERSION=15.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index b1aa2996..96b07cf9 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.0
+ARG NEXTCLOUD_VERSION=16.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 5973419ae3712c9cb3de9ba8db1657b99a3a9ccb Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 May 2019 13:00:07 +0200
Subject: [PATCH 182/328] Add searx build for the master branch

---
 searx/{Dockerfile => Dockerfile.0.15} |  0
 searx/Dockerfile.Master               | 41 +++++++++++++++++++++++++++
 searx/README.md                       |  6 ++++
 3 files changed, 47 insertions(+)
 rename searx/{Dockerfile => Dockerfile.0.15} (100%)
 create mode 100644 searx/Dockerfile.Master

diff --git a/searx/Dockerfile b/searx/Dockerfile.0.15
similarity index 100%
rename from searx/Dockerfile
rename to searx/Dockerfile.0.15
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
new file mode 100644
index 00000000..f4eb25a4
--- /dev/null
+++ b/searx/Dockerfile.Master
@@ -0,0 +1,41 @@
+FROM alpine:3.9
+
+ARG VERSION=master
+
+ENV BASE_URL=False IMAGE_PROXY=False \
+    UID=991 GID=991
+
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
+    build-base \
+    python3-dev \
+    libffi-dev \
+    libxslt-dev \
+    libxml2-dev \
+    openssl-dev \
+    git \
+    ca-certificates \
+ && apk add \
+    su-exec \
+    python3 \
+    libxml2 \
+    libxslt \
+    openssl \
+    tini \
+ && mkdir /usr/local/searx && cd /usr/local/searx \
+ && git clone https://github.com/asciimoo/searx/ . \
+ && pip3 install --upgrade setuptools pip \
+ && pip3 install --no-cache -r requirements.txt \
+ && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
+ && apk del build-dependencies \
+ && rm -f /var/cache/apk/*
+
+COPY run.sh /usr/local/bin/run.sh
+
+RUN chmod +x /usr/local/bin/run.sh
+
+EXPOSE 8888
+
+LABEL maintainer="hoellen <info@hoellen.eu>"
+
+CMD ["run.sh"]
diff --git a/searx/README.md b/searx/README.md
index 59f4e65d..ae70fa60 100644
--- a/searx/README.md
+++ b/searx/README.md
@@ -12,6 +12,12 @@ It provides basic privacy by mixing your queries with searches on other platform
 - Latest code from [asciimoo/searx](https://github.com/asciimoo/searx)
 - A unique secret key is generated when booting the first time.
 
+#### Tags
+- **latest** : latest stable version (0.15)
+- **master** : latest code from master branch
+
+`latest` and `master` are built weekly. For security reasons, you should occasionally update the container, even if you have the latest version of Searx.
+
 #### Build-time variables
 - **VERSION** : Searx version
 

From f2865eda093f50cba6f5773d1a0f48ec00188719 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 21 May 2019 19:43:46 +0200
Subject: [PATCH 183/328] update nginx to 1.17.0

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f35fbbf6..16c8fe72 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.15.12
+ARG NGINX_VERSION=1.17.0
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index 83bebf4d..c7a7429b 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.12
+ARG NGINX_VER=1.17.0
 ARG PHP_VER=7.2.18
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 3d0d83d6..37cccf57 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.15.12
+ARG NGINX_VER=1.17.0
 ARG PHP_VER=7.3.5
 ARG LIBICONV_VERSION=1.15
 

From 012a5dc51643338cf617160b03a1f97710e51879 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 May 2019 12:23:01 +0200
Subject: [PATCH 184/328] update php to 7.2.19 and 7.3.6

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index c7a7429b..f3da9c44 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.0
-ARG PHP_VER=7.2.18
+ARG PHP_VER=7.2.19
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 37cccf57..23cb1348 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.9
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.0
-ARG PHP_VER=7.3.5
+ARG PHP_VER=7.3.6
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From c9ce09f804c2c3f2d8897ad56da33b59453af28e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 20 Jun 2019 13:29:51 +0200
Subject: [PATCH 185/328] update alpine to 3.10

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 searx/Dockerfile.0.15    | 2 +-
 searx/Dockerfile.Master  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 16c8fe72..c806a99a 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 ENV UID=991 GID=991
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index f3da9c44..fb627fa4 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 23cb1348..4ddbe7fa 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 ARG BUILD_CORES
 
diff --git a/searx/Dockerfile.0.15 b/searx/Dockerfile.0.15
index af14bcc4..f7ec552a 100644
--- a/searx/Dockerfile.0.15
+++ b/searx/Dockerfile.0.15
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 ARG VERSION=0.15.0
 
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index f4eb25a4..ee24621f 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 ARG VERSION=master
 

From c29f193571618a3d39fd69e66b340b10c25203e0 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 25 Jun 2019 16:06:33 +0200
Subject: [PATCH 186/328] update nginx to 1.17.1

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index c806a99a..075c02f7 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.0
+ARG NGINX_VERSION=1.17.1
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index fb627fa4..dd9aa17b 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.0
+ARG NGINX_VER=1.17.1
 ARG PHP_VER=7.2.19
 ARG LIBICONV_VERSION=1.15
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 4ddbe7fa..1abca70a 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.0
+ARG NGINX_VER=1.17.1
 ARG PHP_VER=7.3.6
 ARG LIBICONV_VERSION=1.15
 

From 0d2695edab1fc586ab597df2fbd0ea6f13e3e929 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Jul 2019 10:32:39 +0200
Subject: [PATCH 187/328] use php 7.3 image and update matomo to 3.10.0

---
 matomo/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index ddd04807..618c90df 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
-FROM hoellen/nginx-php:7.2
+FROM hoellen/nginx-php:7.3
 
-ARG VERSION=3.9.1
+ARG VERSION=3.10.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From d96979bfe9ff53050420ea6906f9e3eb195da615 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Jul 2019 10:36:08 +0200
Subject: [PATCH 188/328] update nextcloud to 16.0.2, 15.0.9 and 14.0.13

---
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 536e7e90..01ef49b0 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.11
+ARG NEXTCLOUD_VERSION=14.0.13
 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 7df123be..08ed6f28 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.8
+ARG NEXTCLOUD_VERSION=15.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.16.0 b/nextcloud/Dockerfile.16.0
index 96b07cf9..aa8f2d22 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.1
+ARG NEXTCLOUD_VERSION=16.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 9b789a744de6513a01f4b5507301175ce14e0930 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Jul 2019 10:52:31 +0200
Subject: [PATCH 189/328] update php to 7.3.7 and 7.2.20

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index dd9aa17b..f8b9cd6f 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.1
-ARG PHP_VER=7.2.19
+ARG PHP_VER=7.2.20
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 1abca70a..28c99afe 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.1
-ARG PHP_VER=7.3.6
+ARG PHP_VER=7.3.7
 ARG LIBICONV_VERSION=1.15
 
 LABEL description="nginx + php image based on Alpine" \

From 68a919471e4566b15d1cbe9b8b0e402cee4d4e0a Mon Sep 17 00:00:00 2001
From: ziirish <ziirish@ziirish.info>
Date: Tue, 9 Jul 2019 15:53:20 +0200
Subject: [PATCH 190/328] [nextcloud] update to 16.0.3, 15.0.10

---
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 08ed6f28..4e74fd99 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.9
+ARG NEXTCLOUD_VERSION=15.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index aa8f2d22..365ad308 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.2
+ARG NEXTCLOUD_VERSION=16.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From e771fe2cdc808b77a6412e4b0dfa343d5813a834 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 9 Jul 2019 20:16:48 +0200
Subject: [PATCH 191/328] update privatebin to 1.3

---
 privatebin/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 0f4a1c0c..927dc6ef 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.2.1
+ARG PRIVATEBIN_VER=1.3
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \
@@ -40,6 +40,6 @@ EXPOSE 8888
 
 LABEL maintainer="hoellen <info@hoellen.eu>" \
       description="A minimalist, open source online pastebin where the server has zero knowledge of pasted data" \
-      version="PrivateBin 1.2"
+      version="PrivateBin 1.3"
 
 CMD ["run.sh"]

From 1514a0e2e85e8b7ff00ab3cb182b4e97ade94dba Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Thu, 11 Jul 2019 12:38:24 +0200
Subject: [PATCH 192/328] update README

---
 nextcloud/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 85060085..d2712255 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,10 @@
 - Environment variables provided (see below).
 
 ### 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)
+- **latest** : latest stable version (16.0)
+- **16.0** : latest 16.0.x version (stable)
+- **15.0** : latest 15.0.x version (old stable)
+- **14.0** : latest 14.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)~~

From 0eee50e69341a34e04753ca16a2bb55be0847a36 Mon Sep 17 00:00:00 2001
From: Roman Hoellen <info@hoellen.eu>
Date: Wed, 24 Jul 2019 12:12:04 +0200
Subject: [PATCH 193/328] update matomo to 3.11.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 618c90df..a6d6a1b3 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG VERSION=3.10.0
+ARG VERSION=3.11.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 28e4016af8f29a0e0484c70e793cfa5e0c9a418f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 31 Jul 2019 23:10:51 +0200
Subject: [PATCH 194/328] update php (7.2.21, 7.3.8), nginx (1.17.2) and
 libiconv (1.16)

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 6 +++---
 nginx-php/Dockerfile.7.3 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 075c02f7..f3156a9d 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.1
+ARG NGINX_VERSION=1.17.2
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index f8b9cd6f..fd5e7b59 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,9 +2,9 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.1
-ARG PHP_VER=7.2.20
-ARG LIBICONV_VERSION=1.15
+ARG NGINX_VER=1.17.2
+ARG PHP_VER=7.2.21
+ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
       maintainer="hoellen info@hoellen.eu" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 28c99afe..f6ad8470 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,9 +2,9 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.1
-ARG PHP_VER=7.3.7
-ARG LIBICONV_VERSION=1.15
+ARG NGINX_VER=1.17.2
+ARG PHP_VER=7.3.8
+ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
       maintainer="hoellen info@hoellen.eu" \

From cf3b8c5253b2052bf1554a62affb878e4ab021bf Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 13 Aug 2019 11:28:36 +0200
Subject: [PATCH 195/328] add argon2 support

---
 nginx-php/Dockerfile.7.3 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index f6ad8470..c46b111c 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -49,6 +49,7 @@ ARG PHP_CONF=" \
     --with-curl \
     --with-libedit \
     --with-openssl \
+    --with-password-argon2 \
     --with-iconv=/usr/local \
     --with-gd \
     --with-jpeg-dir \
@@ -104,7 +105,8 @@ ARG CUSTOM_BUILD_PKGS=" \
     openssl-dev \
     libbz2 \
     sqlite-dev \
-    imap-dev"
+    imap-dev \
+    argon2-dev"
 
 ARG CUSTOM_PKGS=" \
     freetype \
@@ -113,6 +115,7 @@ ARG CUSTOM_PKGS=" \
     bzip2-dev \
     icu \
     libpq \
+    argon2-libs \
     c-client"
 
 COPY rootfs /

From 2553428d8387a727c6dabef1e20b950c85de43e0 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 14 Aug 2019 14:40:54 +0200
Subject: [PATCH 196/328] Update nginx to 1.17.3

This fixes HTTP/2 vulnerabilities (CVE-2019-9511, CVE-2019-9513, CVE-2019-9516)
---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f3156a9d..5d9006dc 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.2
+ARG NGINX_VERSION=1.17.3
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index fd5e7b59..db29dafe 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.2
+ARG NGINX_VER=1.17.3
 ARG PHP_VER=7.2.21
 ARG LIBICONV_VERSION=1.16
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index c46b111c..ed1b7dbd 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.2
+ARG NGINX_VER=1.17.3
 ARG PHP_VER=7.3.8
 ARG LIBICONV_VERSION=1.16
 

From 3bcf82eebca02f957df865985d24430ffedfda41 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 14 Aug 2019 22:02:13 +0200
Subject: [PATCH 197/328] update Nextcloud to 14.0.14, 15.0.11 and 16.0.4

---
 nextcloud/Dockerfile.14.0 | 2 +-
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
index 01ef49b0..29340af0 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.13
+ARG NEXTCLOUD_VERSION=14.0.14
 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 4e74fd99..96ffc01e 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.10
+ARG NEXTCLOUD_VERSION=15.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 365ad308..5ee2aa82 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.3
+ARG NEXTCLOUD_VERSION=16.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 2dd89f733d8dc856a127e2d2518b203d5b031353 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 23 Aug 2019 10:36:48 +0200
Subject: [PATCH 198/328] add Nextcloud 17.0.0-beta2

---
 nextcloud/Dockerfile.17.0 | 81 +++++++++++++++++++++++++++++++++++++++
 nextcloud/README.md       |  1 +
 2 files changed, 82 insertions(+)
 create mode 100644 nextcloud/Dockerfile.17.0

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
new file mode 100644
index 00000000..65b01542
--- /dev/null
+++ b/nextcloud/Dockerfile.17.0
@@ -0,0 +1,81 @@
+FROM hoellen/nginx-php:7.3
+
+ARG NEXTCLOUD_VERSION=17.0.0beta2
+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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick-libs \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
+ && mkdir /nextcloud \
+ && cd /tmp \
+ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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/README.md b/nextcloud/README.md
index d2712255..8deb5660 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -22,6 +22,7 @@
 
 ### Tags
 - **latest** : latest stable version (16.0)
+- **17.0** : latest 17.0.x version (beta)
 - **16.0** : latest 16.0.x version (stable)
 - **15.0** : latest 15.0.x version (old stable)
 - **14.0** : latest 14.0.x version (deprecated)

From aeb6ce82efadb569a3818b651940b82949c18eb3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 31 Aug 2019 16:14:03 +0200
Subject: [PATCH 199/328] update Nextcloud to 17.0-beta3

---
 nextcloud/Dockerfile.17.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 65b01542..0cbef49c 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0beta2
+ARG NEXTCLOUD_VERSION=17.0.0beta3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 31de0552cddde7abd1b049145732e775420c3e46 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 31 Aug 2019 17:22:54 +0200
Subject: [PATCH 200/328] update PHP to 7.2.22 and 7.3.9

---
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index db29dafe..e169d828 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.3
-ARG PHP_VER=7.2.21
+ARG PHP_VER=7.2.22
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index ed1b7dbd..a5dc3691 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.3
-ARG PHP_VER=7.3.8
+ARG PHP_VER=7.3.9
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 14afc3b6d96baa031e09e4753d176cb0670b8eaf Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 5 Sep 2019 15:33:07 +0200
Subject: [PATCH 201/328] update Nextcloud to 17.0-beta4

---
 nextcloud/Dockerfile.17.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 0cbef49c..6571f098 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0beta3
+ARG NEXTCLOUD_VERSION=17.0.0beta4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From be4eff0553ecfccf09d1de30113ba92d1f42debd Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 12 Sep 2019 16:57:08 +0200
Subject: [PATCH 202/328] update Nextcloud to 17.0-RC1

---
 nextcloud/Dockerfile.17.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 6571f098..cbbbddbf 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0beta4
+ARG NEXTCLOUD_VERSION=17.0.0RC1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 075f3659f6ac35ad971f2c9ac5d89f89a313aae3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 13 Sep 2019 18:40:15 +0200
Subject: [PATCH 203/328] update nginx config

 - sort headers
 - use 'always' condition on headers
 - serve static map and bcmap files
---
 .../rootfs/nginx/sites-enabled/nginx.conf     | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index d00377ae..8620e935 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -4,14 +4,13 @@ server {
 
         fastcgi_buffers 64 4K;
 
-        add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload";
-        add_header X-Content-Type-Options nosniff;
-        add_header X-XSS-Protection "1; mode=block";
-        add_header X-Robots-Tag none;
-        add_header X-Download-Options noopen;
-        add_header X-Permitted-Cross-Domain-Policies none;
-        add_header Referrer-Policy no-referrer;
-
+        add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+        add_header Referrer-Policy "no-referrer" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header X-Download-Options "noopen" always;
+        add_header X-Permitted-Cross-Domain-Policies "none" always;
+        add_header X-Robots-Tag "none" always;
+        add_header X-XSS-Protection "1; mode=block" always;
 
 
         location = /robots.txt {
@@ -63,20 +62,20 @@ server {
             index index.php;
         }
 
-        location ~ \.(?:css|js|woff2?|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=7200";
-            add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
-            add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
-            add_header X-Robots-Tag none;
-            add_header X-Download-Options noopen;
-            add_header X-Permitted-Cross-Domain-Policies none;
-            add_header Referrer-Policy no-referrer;
+            add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+            add_header Referrer-Policy "no-referrer" always;
+            add_header X-Content-Type-Options "nosniff" always;
+            add_header X-Download-Options "noopen" always;
+            add_header X-Permitted-Cross-Domain-Policies "none" always;
+            add_header X-Robots-Tag "none" always;
+            add_header X-XSS-Protection "1; mode=block" always;
             access_log off;
         }
 
-        location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
+        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
             try_files $uri /index.php$request_uri;
             access_log off;
         }

From 5fe4185891734dd1eadb227d8e30c5d8e37c5923 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 19 Sep 2019 18:14:46 +0200
Subject: [PATCH 204/328] update Nextcloud to 17.0-RC2

---
 nextcloud/Dockerfile.17.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index cbbbddbf..3db915a2 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0RC1
+ARG NEXTCLOUD_VERSION=17.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From adfcd9e31a311ff75d63aadf0da1b570403f193f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 23 Sep 2019 05:30:19 +0200
Subject: [PATCH 205/328] update Privatebin to 1.3.1

---
 privatebin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 927dc6ef..c36f23eb 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.3
+ARG PRIVATEBIN_VER=1.3.1
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \

From 06f1863e2c1bd37cc969925eda1b151d9ba170e1 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 25 Sep 2019 10:57:22 +0200
Subject: [PATCH 206/328] update nginx to 1.17.4

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.2 | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 5d9006dc..77186c09 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.3
+ARG NGINX_VERSION=1.17.4
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
index e169d828..66f4ff1c 100644
--- a/nginx-php/Dockerfile.7.2
+++ b/nginx-php/Dockerfile.7.2
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.3
+ARG NGINX_VER=1.17.4
 ARG PHP_VER=7.2.22
 ARG LIBICONV_VERSION=1.16
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index a5dc3691..01c914ff 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.3
+ARG NGINX_VER=1.17.4
 ARG PHP_VER=7.3.9
 ARG LIBICONV_VERSION=1.16
 

From b1c9aeab112911ddaf66529fa132a67de4028810 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 25 Sep 2019 15:23:37 +0200
Subject: [PATCH 207/328] Nextcloud 14 EOL

---
 nextcloud/Dockerfile.14.0 | 76 ---------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.14.0

diff --git a/nextcloud/Dockerfile.14.0 b/nextcloud/Dockerfile.14.0
deleted file mode 100644
index 29340af0..00000000
--- a/nextcloud/Dockerfile.14.0
+++ /dev/null
@@ -1,76 +0,0 @@
-FROM hoellen/nginx-php:7.2
-
-ARG NEXTCLOUD_VERSION=14.0.14
-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"]

From 092e314edd7e8458e80fd53c18ccab615f2b919d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 25 Sep 2019 20:33:46 +0200
Subject: [PATCH 208/328] update Nextcloud to 15.0.12, 16.0.5 and final 17.0.0

---
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 96ffc01e..1c94e399 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.11
+ARG NEXTCLOUD_VERSION=15.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 5ee2aa82..2c9f7476 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.4
+ARG NEXTCLOUD_VERSION=16.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 3db915a2..24dbf552 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0RC2
+ARG NEXTCLOUD_VERSION=17.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -48,9 +48,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From c0e8fb4c0931246dd7f089e6274e03e49d588d2b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 26 Sep 2019 00:50:36 +0200
Subject: [PATCH 209/328] Remove PHP 7.2

---
 nginx-php/Dockerfile.7.2 | 180 ---------------------------------------
 privatebin/README.md     |   2 +-
 2 files changed, 1 insertion(+), 181 deletions(-)
 delete mode 100644 nginx-php/Dockerfile.7.2

diff --git a/nginx-php/Dockerfile.7.2 b/nginx-php/Dockerfile.7.2
deleted file mode 100644
index 66f4ff1c..00000000
--- a/nginx-php/Dockerfile.7.2
+++ /dev/null
@@ -1,180 +0,0 @@
-FROM alpine:3.10
-
-ARG BUILD_CORES
-
-ARG NGINX_VER=1.17.4
-ARG PHP_VER=7.2.22
-ARG LIBICONV_VERSION=1.16
-
-LABEL description="nginx + php image based on Alpine" \
-      maintainer="hoellen info@hoellen.eu" \
-      php_version="PHP v$PHP_VER built from source" \
-      nginx_version="nginx v$NGINX_VER built from source"
-
-ARG PHP_MIRROR=http://ch1.php.net
-
-ARG NGINX_CONF=" \
-    --prefix=/nginx \
-    --sbin-path=/usr/local/sbin/nginx \
-    --http-log-path=/nginx/logs/access.log \
-    --error-log-path=/nginx/logs/error.log \
-    --pid-path=/nginx/run/nginx.pid \
-    --lock-path=/nginx/run/nginx.lock \
-    --with-threads \
-    --with-file-aio \
-    --without-http_geo_module \
-    --without-http_autoindex_module \
-    --without-http_split_clients_module \
-    --without-http_memcached_module \
-    --without-http_empty_gif_module \
-    --without-http_browser_module"
-
-ARG PHP_CONF=" \
-    --prefix=/usr \
-    --libdir=/usr/lib/php \
-    --datadir=/usr/share/php \
-    --sysconfdir=/php/etc \
-    --localstatedir=/php/var \
-    --with-pear=/usr/share/php \
-    --with-config-file-scan-dir=/php/conf.d \
-    --with-config-file-path=/php \
-    --with-pic \
-    --disable-short-tags \
-    --without-readline \
-    --enable-bcmath=shared \
-    --enable-fpm \
-    --disable-cgi \
-    --enable-mysqlnd \
-    --enable-mbstring \
-    --with-curl \
-    --with-libedit \
-    --with-openssl \
-    --with-iconv=/usr/local \
-    --with-gd \
-    --with-jpeg-dir \
-    --with-png-dir \
-    --with-webp-dir \
-    --with-xpm-dir=no \
-    --with-freetype-dir \
-    --disable-gd-jis-conv \
-    --with-zlib"
-
-ARG PHP_EXT_LIST=" \
-    mysqli \
-    ctype \
-    dom \
-    json \
-    xml \
-    mbstring \
-    posix \
-    xmlwriter \
-    zip \
-    zlib \
-    sqlite3 \
-    pdo_sqlite \
-    pdo_pgsql \
-    pdo_mysql \
-    pcntl \
-    curl \
-    fileinfo \
-    bz2 \
-    intl \
-    openssl \
-    ldap \
-    simplexml \
-    pgsql \
-    ftp \
-    exif \
-    gmp \
-    imap"
-
-ARG CUSTOM_BUILD_PKGS=" \
-    freetype-dev \
-    openldap-dev \
-    gmp-dev \
-    icu-dev \
-    postgresql-dev \
-    libpng-dev \
-    libwebp-dev \
-    gd-dev \
-    libjpeg-turbo-dev \
-    libxpm-dev \
-    libedit-dev \
-    libxml2-dev \
-    openssl-dev \
-    libbz2 \
-    sqlite-dev \
-    imap-dev"
-
-ARG CUSTOM_PKGS=" \
-    freetype \
-    openldap \
-    gmp \
-    bzip2-dev \
-    icu \
-    libpq \
-    c-client"
-
-COPY rootfs /
-
-RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
- && BUILD_DEPS=" \
-    linux-headers \
-    libtool \
-    build-base \
-    pcre-dev \
-    zlib-dev \
-    wget \
-    gnupg \
-    autoconf \
-    gcc \
-    g++ \
-    libc-dev \
-    make \
-    pkgconf \
-    curl-dev \
-    ca-certificates \
-    ${CUSTOM_BUILD_PKGS}" \
- && apk -U add \
-    ${BUILD_DEPS} \
-    s6 \
-    su-exec \
-    curl \
-    libedit \
-    libxml2 \
-    openssl \
-    libwebp \
-    gd \
-    pcre \
-    zlib \
-    ${CUSTOM_PKGS} \
- && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
- && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
- && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
- && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz.asc/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz.asc \
- && wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz -O /tmp/libiconv-${LIBICONV_VERSION}.tar.gz \
- && mkdir -p /php/conf.d \
- && mkdir -p /usr/src \
- && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
- && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
- && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
- && cd /usr/src/nginx-${NGINX_VER} \
- && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
- && make -j ${NB_CORES} \
- && make install \
- && cd /usr/src/libiconv-${LIBICONV_VERSION} \
- && ./configure --prefix=/usr/local \
- && make && make install && libtool --finish /usr/local/lib \
- && mv /usr/src/php-${PHP_VER} /usr/src/php \
- && cd /usr/src/php \
- && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
- && make -j ${NB_CORES} \
- && make install \
- && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
- && make clean \
- && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
- && sleep 1 \
- && docker-php-ext-install ${PHP_EXT_LIST} \
- && apk del ${BUILD_DEPS} \
- && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
- && mkdir -p /nginx/logs /nginx/run /php/php-fpm.d /php/logs /php/run /php/session
diff --git a/privatebin/README.md b/privatebin/README.md
index e44df158..b3c87cf2 100644
--- a/privatebin/README.md
+++ b/privatebin/README.md
@@ -7,7 +7,7 @@ Paste securely.
 - Uses [PrivateBin](https://github.com/PrivateBin/PrivateBin), originally a fork of zerobin by elrido.
 - GPG signature check
 - separate /data directory
-- Bundled with nginx and PHP7.2
+- Bundled with nginx and PHP
 
 #### Build-time variables
 - **PRIVATEBIN_VER** : version of PrivateBin

From 76440651e6158f26d4c3ad180e667b472777018f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 26 Sep 2019 03:37:49 +0200
Subject: [PATCH 210/328] update README

---
 nextcloud/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 8deb5660..a758d9c9 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,11 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (16.0)
-- **17.0** : latest 17.0.x version (beta)
-- **16.0** : latest 16.0.x version (stable)
-- **15.0** : latest 15.0.x version (old stable)
-- **14.0** : latest 14.0.x version (deprecated)
+- **latest** : latest stable version (17.0)
+- **17.0** : latest 17.0.x version (stable)
+- **16.0** : latest 16.0.x version (old stable)
+- **15.0** : latest 15.0.x version (deprecated)
+- ~~**14.0** : latest 14.0.x version (end-of-life)~~
 - ~~**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)~~

From ed79906d7d03609e95a127ed1967ad2d533bfc26 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 26 Sep 2019 13:23:21 +0200
Subject: [PATCH 211/328] add X-Frame-Options header to nginx conf

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 8620e935..7331a008 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -8,6 +8,7 @@ server {
         add_header Referrer-Policy "no-referrer" always;
         add_header X-Content-Type-Options "nosniff" always;
         add_header X-Download-Options "noopen" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         add_header X-Permitted-Cross-Domain-Policies "none" always;
         add_header X-Robots-Tag "none" always;
         add_header X-XSS-Protection "1; mode=block" always;
@@ -69,6 +70,7 @@ server {
             add_header Referrer-Policy "no-referrer" always;
             add_header X-Content-Type-Options "nosniff" always;
             add_header X-Download-Options "noopen" always;
+            add_header X-Frame-Options "SAMEORIGIN" always;
             add_header X-Permitted-Cross-Domain-Policies "none" always;
             add_header X-Robots-Tag "none" always;
             add_header X-XSS-Protection "1; mode=block" always;

From ea069ac4bb94916b1c80c774da83c2b9d2dca9ec Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 26 Sep 2019 16:48:48 +0200
Subject: [PATCH 212/328] update php to 7.3.10

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 01c914ff..b18ed27b 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.4
-ARG PHP_VER=7.3.9
+ARG PHP_VER=7.3.10
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From f0e27e1f58db163e7ce0b76ca182e92b179d5e73 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 30 Sep 2019 22:44:50 +0200
Subject: [PATCH 213/328] remove X-Frame-Options header for Nextcloud 16 and 15

---
 nextcloud/Dockerfile.15.0 | 3 ++-
 nextcloud/Dockerfile.16.0 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 1c94e399..98be9eaf 100644
--- a/nextcloud/Dockerfile.15.0
+++ b/nextcloud/Dockerfile.15.0
@@ -68,7 +68,8 @@ RUN apk -U upgrade \
 
 COPY rootfs /
 
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* \
+ && sed -i '/SAMEORIGIN/d' /nginx/sites-enabled/nginx.conf
 
 VOLUME /data /config /apps2 /nextcloud/themes
 
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 2c9f7476..0d441d09 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -68,7 +68,8 @@ RUN apk -U upgrade \
 
 COPY rootfs /
 
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
+RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* \
+ && sed -i '/SAMEORIGIN/d' /nginx/sites-enabled/nginx.conf
 
 VOLUME /data /config /apps2 /nextcloud/themes
 

From c37cc09c4a69faf178fb3fd0ae15475635464671 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 24 Oct 2019 12:42:43 +0200
Subject: [PATCH 214/328] Update PHP to 7.3.11

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index b18ed27b..b28084eb 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.4
-ARG PHP_VER=7.3.10
+ARG PHP_VER=7.3.11
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From c206665ed8bf21a56d8e38b8516ba50107c2a332 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 24 Oct 2019 18:40:29 +0200
Subject: [PATCH 215/328] harden nextcloud nginx config

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 7331a008..3a663ad3 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -33,7 +33,7 @@ server {
         }
 
         location / {
-            rewrite ^ /index.php$request_uri;
+            rewrite ^ /index.php;
         }
 
         location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
@@ -47,6 +47,7 @@ server {
         location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(?:$|/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            try_files $fastcgi_script_name =404;
             fastcgi_hide_header X-Powered-By;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_path_info;

From 830df3e63801dc3c846ba6b60c5420825fe92940 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 30 Oct 2019 09:06:36 +0100
Subject: [PATCH 216/328] update Matomo to 3.12.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index a6d6a1b3..e5b263ca 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG VERSION=3.11.0
+ARG VERSION=3.12.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From f59f22717fdad10a3b5fc4008dc433b06538c58c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 6 Nov 2019 22:14:56 +0100
Subject: [PATCH 217/328] Update Nextcloud to 15.0.13, 16.0.6 and 17.0.1

---
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 98be9eaf..10822eca 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.12
+ARG NEXTCLOUD_VERSION=15.0.13
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 0d441d09..09e4457f 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.5
+ARG NEXTCLOUD_VERSION=16.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 24dbf552..679fdd84 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.0
+ARG NEXTCLOUD_VERSION=17.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 8ee6cc827f1012d3d8634e7ef4dc59fe4552f2f6 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 19 Nov 2019 21:54:23 +0100
Subject: [PATCH 218/328] Update nginx to 1.17.6

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 77186c09..a3381b3f 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.4
+ARG NGINX_VERSION=1.17.6
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index b28084eb..6a8145a9 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.10
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.4
+ARG NGINX_VER=1.17.6
 ARG PHP_VER=7.3.11
 ARG LIBICONV_VERSION=1.16
 

From 3da0ffe1254c564913c86f74f3260a574203d49b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 21 Nov 2019 12:20:07 +0100
Subject: [PATCH 219/328] update php to 7.3.12

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 6a8145a9..6a5eb78a 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.6
-ARG PHP_VER=7.3.11
+ARG PHP_VER=7.3.12
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From a2deb6823bdd192df105e0cf8a458858e3cdd058 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 27 Nov 2019 13:46:23 +0100
Subject: [PATCH 220/328] Update Matomo to 3.13.0

---
 matomo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index e5b263ca..a10f56a6 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG VERSION=3.12.0
+ARG VERSION=3.13.0
 ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991 \

From 4cc9d87d1127bd836b861c2d7b0ed22576fc5827 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 19 Dec 2019 09:12:45 +0100
Subject: [PATCH 221/328] update Nextcloud to 17.0.2, 16.0.7 and 15.0.14

---
 nextcloud/Dockerfile.15.0 | 2 +-
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
index 10822eca..7bfa6ea8 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.13
+ARG NEXTCLOUD_VERSION=15.0.14
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 09e4457f..94e55480 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.6
+ARG NEXTCLOUD_VERSION=16.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 679fdd84..41d8cccd 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.1
+ARG NEXTCLOUD_VERSION=17.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 9dd745d6a72e72c1247ff23ac192394a8196c984 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 19 Dec 2019 09:16:48 +0100
Subject: [PATCH 222/328] update PHP to 7.3.13

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 6a5eb78a..21fdf4da 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.6
-ARG PHP_VER=7.3.12
+ARG PHP_VER=7.3.13
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 0c67416d53198e68275be1b38f7e1bf302156de1 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 19 Dec 2019 20:34:31 +0100
Subject: [PATCH 223/328] Update base Alpine image to 3.11

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 searx/Dockerfile.0.15    | 2 +-
 searx/Dockerfile.Master  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index a3381b3f..418b3bf2 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 ENV UID=991 GID=991
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 21fdf4da..91383758 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 ARG BUILD_CORES
 
diff --git a/searx/Dockerfile.0.15 b/searx/Dockerfile.0.15
index f7ec552a..37175459 100644
--- a/searx/Dockerfile.0.15
+++ b/searx/Dockerfile.0.15
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 ARG VERSION=0.15.0
 
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index ee24621f..b9a65581 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 ARG VERSION=master
 

From 3ee290ec901f87ae0dad0e4b9df35f89c0667823 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 25 Dec 2019 23:25:19 +0100
Subject: [PATCH 224/328] Update nginx to 1.17.7

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 418b3bf2..e4c3d5c9 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.6
+ARG NGINX_VERSION=1.17.7
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 91383758..fa1bc9c3 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.6
+ARG NGINX_VER=1.17.7
 ARG PHP_VER=7.3.13
 ARG LIBICONV_VERSION=1.16
 

From 2240c12882377732901285b9655258f01ecc4636 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 13 Jan 2020 09:33:21 +0100
Subject: [PATCH 225/328] Update PrivateBin to 1.3.2

---
 privatebin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index c36f23eb..ac9881e2 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.3.1
+ARG PRIVATEBIN_VER=1.3.2
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \

From 65c01c63108b264d15aa081f7c43eb61bd09ad07 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 Jan 2020 22:14:08 +0100
Subject: [PATCH 226/328] Add Nextcloud 18.0

---
 nextcloud/Dockerfile.18.0 | 81 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 nextcloud/Dockerfile.18.0

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
new file mode 100644
index 00000000..b6d60578
--- /dev/null
+++ b/nextcloud/Dockerfile.18.0
@@ -0,0 +1,81 @@
+FROM hoellen/nginx-php:7.3
+
+ARG NEXTCLOUD_VERSION=18.0.0
+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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick-libs \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.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"]

From 0a645c1e3d19fff679b024928145f9528bc702ad Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 20 Jan 2020 16:49:49 +0100
Subject: [PATCH 227/328] Update README and remove Nextcloud 15

---
 nextcloud/Dockerfile.15.0 | 82 ---------------------------------------
 nextcloud/README.md       |  9 +++--
 2 files changed, 5 insertions(+), 86 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.15.0

diff --git a/nextcloud/Dockerfile.15.0 b/nextcloud/Dockerfile.15.0
deleted file mode 100644
index 7bfa6ea8..00000000
--- a/nextcloud/Dockerfile.15.0
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=15.0.14
-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 \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick-libs \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.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/* \
- && sed -i '/SAMEORIGIN/d' /nginx/sites-enabled/nginx.conf
-
-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/README.md b/nextcloud/README.md
index a758d9c9..670921ad 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (17.0)
-- **17.0** : latest 17.0.x version (stable)
-- **16.0** : latest 16.0.x version (old stable)
-- **15.0** : latest 15.0.x version (deprecated)
+- **latest** : latest stable version (18.0)
+- **18.0** : latest 18.0.x version (stable)
+- **17.0** : latest 17.0.x version (old stable)
+- **16.0** : latest 16.0.x version (deprecated)
+- ~~**15.0** : latest 15.0.x version (end-of-life)~~
 - ~~**14.0** : latest 14.0.x version (end-of-life)~~
 - ~~**13.0** : latest 13.0.x version (end-of-life)~~
 - ~~**12.0** : latest 12.0.x version (end-of-life)~~

From 179fbd216328fcc0c386d14cb674d52ce4b6f529 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 23 Jan 2020 08:46:19 +0100
Subject: [PATCH 228/328] Update nginx to 1.17.8

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index e4c3d5c9..f59dd218 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.7
+ARG NGINX_VERSION=1.17.8
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index fa1bc9c3..f6899269 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.7
+ARG NGINX_VER=1.17.8
 ARG PHP_VER=7.3.13
 ARG LIBICONV_VERSION=1.16
 

From c60c4ab053a1063eaa28e4a14bbf82855cd5d5cc Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 23 Jan 2020 08:49:03 +0100
Subject: [PATCH 229/328] Update PHP to 7.3.14

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index f6899269..03861551 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.11
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.8
-ARG PHP_VER=7.3.13
+ARG PHP_VER=7.3.14
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 8f84b03f4ff9a0b7273de244ce831b8933bb363f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 27 Jan 2020 11:44:44 +0100
Subject: [PATCH 230/328] Update Nextcloud README

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 670921ad..4793c422 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -113,7 +113,7 @@ docker run -d --name nextcloud \
        -e DB_USER=nextcloud \
        -e DB_PASSWORD=supersecretpassword \
        -e DB_HOST=db_nextcloud \
-       hoellen/nextcloud:15.0
+       hoellen/nextcloud:18.0
 ```
 
 You are **not obliged** to use `ADMIN_USER` and `ADMIN_PASSWORD`. If these variables are not provided, you'll be able to configure your admin acccount from your browser.

From 71cc05108960347f30c51b4c179350d220612a39 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 Jan 2020 14:50:46 +0100
Subject: [PATCH 231/328] Update searx to 0.16

---
 searx/{Dockerfile.0.15 => Dockerfile.Latest} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename searx/{Dockerfile.0.15 => Dockerfile.Latest} (97%)

diff --git a/searx/Dockerfile.0.15 b/searx/Dockerfile.Latest
similarity index 97%
rename from searx/Dockerfile.0.15
rename to searx/Dockerfile.Latest
index 37175459..2afe005e 100644
--- a/searx/Dockerfile.0.15
+++ b/searx/Dockerfile.Latest
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 
-ARG VERSION=0.15.0
+ARG VERSION=0.16.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991

From b4c2c80937fb00f355b266c2450f2b2bd8894c7f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 30 Jan 2020 22:10:25 +0100
Subject: [PATCH 232/328] Update Nextcloud to 16.0.8 and 17.0.3

---
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 94e55480..f88f43c7 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.7
+ARG NEXTCLOUD_VERSION=16.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 41d8cccd..7b2aecae 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.2
+ARG NEXTCLOUD_VERSION=17.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From a981ded8070a8df36a884f444fa92eba414861f3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 7 Feb 2020 17:48:45 +0100
Subject: [PATCH 233/328] Change proxy header from $host to $http_host

---
 boring-nginx/rootfs/etc/nginx/conf/proxy_params | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/rootfs/etc/nginx/conf/proxy_params b/boring-nginx/rootfs/etc/nginx/conf/proxy_params
index bbc4e4b3..8d7e03d7 100644
--- a/boring-nginx/rootfs/etc/nginx/conf/proxy_params
+++ b/boring-nginx/rootfs/etc/nginx/conf/proxy_params
@@ -1,4 +1,4 @@
-proxy_set_header        Host                 $host;
+proxy_set_header        Host                 $http_host;
 proxy_set_header        X-Real-IP            $remote_addr;
 proxy_set_header        X-Forwarded-For      $proxy_add_x_forwarded_for;
 proxy_set_header        X-Remote-Port        $remote_port;

From c100c65b0f12bf672701fa57d0e0580b7bac615f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 13 Feb 2020 08:54:38 +0100
Subject: [PATCH 234/328] Update Nextcloud to 18.0.1

---
 nextcloud/Dockerfile.18.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index b6d60578..c26fc00e 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.0
+ARG NEXTCLOUD_VERSION=18.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 0f36f1da5de6c90b2822acea76bcb35bf901e41e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 16 Feb 2020 11:31:27 +0100
Subject: [PATCH 235/328] Update PrivateBin to 1.3.3

---
 privatebin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index ac9881e2..479cee36 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.3.2
+ARG PRIVATEBIN_VER=1.3.3
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \

From 1ba88681df6b0de999dcc0632a0c4196c0f9726f Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Thu, 20 Feb 2020 14:42:12 +0100
Subject: [PATCH 236/328] Update PHP to 7.3.15

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 03861551..bbe44726 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.11
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.8
-ARG PHP_VER=7.3.14
+ARG PHP_VER=7.3.15
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From fbffe385ead8bab2a84578537c8514cdb5a3ff42 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 3 Mar 2020 17:23:55 +0100
Subject: [PATCH 237/328] Update nginx to 1.17.9

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f59dd218..74513643 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.8
+ARG NGINX_VERSION=1.17.9
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index bbe44726..5b3152be 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.8
+ARG NGINX_VER=1.17.9
 ARG PHP_VER=7.3.15
 ARG LIBICONV_VERSION=1.16
 

From 04ba50d5e4ecf3a70bfccde8a01099d6daa2419f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 11 Mar 2020 17:10:23 +0100
Subject: [PATCH 238/328] Update Nextcloud to 18.0.2, 17.0.4, 16.0.9

---
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index f88f43c7..557417cb 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.8
+ARG NEXTCLOUD_VERSION=16.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.17.0 b/nextcloud/Dockerfile.17.0
index 7b2aecae..e228a941 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.3
+ARG NEXTCLOUD_VERSION=17.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index c26fc00e..53d68662 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.1
+ARG NEXTCLOUD_VERSION=18.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 6a627506dd60856e7ed03dd9baa508cc8c2d4750 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 22 Mar 2020 10:46:31 +0100
Subject: [PATCH 239/328] Update PrivateBin to 1.3.4

---
 privatebin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 479cee36..98c97cd6 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.3.3
+ARG PRIVATEBIN_VER=1.3.4
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \

From 2339644748e7baed8714caa7f2afd10426738a06 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 24 Mar 2020 08:53:41 +0100
Subject: [PATCH 240/328] Update Nextcloud to 18.0.3 and 17.0.5

---
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index e228a941..958ae9af 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.4
+ARG NEXTCLOUD_VERSION=17.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 53d68662..a8d4190e 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.2
+ARG NEXTCLOUD_VERSION=18.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 57364b9c375ba527d2736301d2f423cd7ecdd3cc Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 15 Apr 2020 12:43:36 +0200
Subject: [PATCH 241/328] Update nginx to 1.17.10

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 74513643..f2109cfa 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.9
+ARG NGINX_VERSION=1.17.10
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 5b3152be..2dba050e 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.9
+ARG NGINX_VER=1.17.10
 ARG PHP_VER=7.3.15
 ARG LIBICONV_VERSION=1.16
 

From 1d553e56e0aab7f3d96920918376adb0bf31d318 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 Apr 2020 10:48:56 +0200
Subject: [PATCH 242/328] Update PHP to 7.3.17

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 2dba050e..ead56a16 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.11
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.17.10
-ARG PHP_VER=7.3.15
+ARG PHP_VER=7.3.17
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 4c1314551daadd498384356910e0e557fe80175d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 23 Apr 2020 13:10:25 +0200
Subject: [PATCH 243/328] Update Nextcloud to 18.0.4, 17.0.6 and 16.0.10

---
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index 557417cb..ccd63360 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.9
+ARG NEXTCLOUD_VERSION=16.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 958ae9af..4470a63e 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.5
+ARG NEXTCLOUD_VERSION=17.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index a8d4190e..779d755b 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.3
+ARG NEXTCLOUD_VERSION=18.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From c8998c394afc5cd6be15d1f9151589dba489ca55 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 24 Apr 2020 10:05:59 +0200
Subject: [PATCH 244/328] Use nginx stable releases

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f2109cfa..38e4699e 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.17.10
+ARG NGINX_VERSION=1.18.0
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index ead56a16..46d47789 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.11
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.17.10
+ARG NGINX_VER=1.18.0
 ARG PHP_VER=7.3.17
 ARG LIBICONV_VERSION=1.16
 

From f0e781606e986a2573f1923917f9b6835910811a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 27 Apr 2020 09:07:44 +0200
Subject: [PATCH 245/328] Update nginx config

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 3a663ad3..75ba9588 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -47,10 +47,11 @@ server {
         location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(?:$|/) {
             include /nginx/conf/fastcgi_params;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            set $path_info $fastcgi_path_info;
             try_files $fastcgi_script_name =404;
             fastcgi_hide_header X-Powered-By;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param PATH_INFO $fastcgi_path_info;
+            fastcgi_param PATH_INFO $path_info;
             fastcgi_param modHeadersAvailable true;
             fastcgi_param front_controller_active true;
             fastcgi_pass unix:/php/run/php-fpm.sock;
@@ -78,7 +79,7 @@ server {
             access_log off;
         }
 
-        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
+        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
             try_files $uri /index.php$request_uri;
             access_log off;
         }

From 9254ace25872f2494ab45b155406a1f99ccba281 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 14 May 2020 10:32:44 +0200
Subject: [PATCH 246/328] Update PHP to 7.3.18

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 46d47789..cbf0779f 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.11
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.17
+ARG PHP_VER=7.3.18
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 8315df0053dc5815a3465a6cd988efdb50d7f435 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 21 May 2020 11:11:21 +0200
Subject: [PATCH 247/328] Add bcmath package to nginx-php

---
 nginx-php/Dockerfile.7.3 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index cbf0779f..2525f4c1 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -86,6 +86,7 @@ ARG PHP_EXT_LIST=" \
     pgsql \
     ftp \
     exif \
+    bcmath \
     gmp \
     imap"
 

From bded641e142133603b258369a02e1f4218fc8258 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 21 May 2020 11:13:07 +0200
Subject: [PATCH 248/328] Add new Nextcloud version 19-RC3

---
 nextcloud/Dockerfile.19.0 | 81 +++++++++++++++++++++++++++++++++++++++
 nextcloud/README.md       |  1 +
 2 files changed, 82 insertions(+)
 create mode 100644 nextcloud/Dockerfile.19.0

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
new file mode 100644
index 00000000..03a67436
--- /dev/null
+++ b/nextcloud/Dockerfile.19.0
@@ -0,0 +1,81 @@
+FROM hoellen/nginx-php:7.3
+
+ARG NEXTCLOUD_VERSION=19.0.0RC3
+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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick-libs \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
+ && mkdir /nextcloud \
+ && cd /tmp \
+ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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/README.md b/nextcloud/README.md
index 4793c422..2f0db158 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -22,6 +22,7 @@
 
 ### Tags
 - **latest** : latest stable version (18.0)
+- **19.0** : latest 19.0.x version (beta)
 - **18.0** : latest 18.0.x version (stable)
 - **17.0** : latest 17.0.x version (old stable)
 - **16.0** : latest 16.0.x version (deprecated)

From 73058802ec05c15eb12069944d41034d021d1615 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 25 May 2020 14:41:07 +0200
Subject: [PATCH 249/328] generate instanceid non-deterministically

---
 nextcloud/rootfs/usr/local/bin/setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nextcloud/rootfs/usr/local/bin/setup.sh b/nextcloud/rootfs/usr/local/bin/setup.sh
index df299926..636c1ef0 100755
--- a/nextcloud/rootfs/usr/local/bin/setup.sh
+++ b/nextcloud/rootfs/usr/local/bin/setup.sh
@@ -8,7 +8,8 @@ CONFIGFILE=/config/config.php
 
 
 # Create an initial configuration file.
-instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1)
+instanceid=oc$(openssl rand -hex 6 | head -c 10)
+
 cat > $CONFIGFILE <<EOF;
 <?php
 \$CONFIG = array (

From 13b16b9d2b297baec23ffd56fbf89e73e2b0afd0 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 25 May 2020 14:49:22 +0200
Subject: [PATCH 250/328] Update README

---
 nextcloud/README.md | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 2f0db158..4c60a1b4 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -37,7 +37,6 @@ Other tags than `daily` are built weekly. For security reasons, you should occas
 
 ### Build-time variables
 - **NEXTCLOUD_VERSION** : version of nextcloud
-- **GNU_LIBICONV_VERSION** : version of GNU Libiconv
 - **GPG_nextcloud** : signing key fingerprint
 
 ### Environment variables
@@ -85,14 +84,14 @@ Please note, that you may need to adjust some database settings to your hardware
 Pull the image and create a container. `/docker` can be anywhere on your host, this is just an example. Change `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` values (mariadb). You may also want to change UID and GID for Nextcloud, as well as other variables (see *Environment Variables*).
 
 ```
-docker pull hoellen/nextcloud:15.0 && docker pull mariadb:10
+docker pull hoellen/nextcloud && docker pull mariadb
 
 docker run -d --name db_nextcloud \
        -v /docker/nextcloud/db:/var/lib/mysql \
        -e MYSQL_ROOT_PASSWORD=supersecretpassword \
        -e MYSQL_DATABASE=nextcloud -e MYSQL_USER=nextcloud \
        -e MYSQL_PASSWORD=supersecretpassword \
-       mariadb:10
+       mariadb
 
 docker run -d --name nextcloud \
        --link db_nextcloud:db_nextcloud \
@@ -114,18 +113,13 @@ docker run -d --name nextcloud \
        -e DB_USER=nextcloud \
        -e DB_PASSWORD=supersecretpassword \
        -e DB_HOST=db_nextcloud \
-       hoellen/nextcloud:18.0
+       hoellen/nextcloud
 ```
 
 You are **not obliged** to use `ADMIN_USER` and `ADMIN_PASSWORD`. If these variables are not provided, you'll be able to configure your admin acccount from your browser.
 
 **Below you can find a docker-compose file, which is very useful!**
 
-Now you have to use a **reverse proxy** in order to access to your container through Internet, steps and details are available at the end of the README.md. And that's it! Since you already configured Nextcloud through setting environment variables, there's no setup page.
-
-### ARM-based devices
-You will have to build yourself using an Alpine-ARM image, like `orax/alpine-armhf:edge`.
-
 ### Configure
 In the admin panel, you should switch from `AJAX cron` to `cron` (system cron).
 
@@ -150,7 +144,6 @@ services:
     image: hoellen/nextcloud
     depends_on:
       - nextcloud-db           # If using MySQL
-      - solr                   # If using Nextant
       - redis                  # If using Redis
     environment:
       - UID=1000
@@ -160,8 +153,6 @@ services:
       - OPCACHE_MEM_SIZE=128
       - CRON_PERIOD=15m
       - TZ=Europe/Berlin
-      - ADMIN_USER=admin            # Don't set to configure through browser
-      - ADMIN_PASSWORD=admin        # Don't set to configure through browser
       - DOMAIN=localhost
       - DB_TYPE=mysql
       - DB_NAME=nextcloud
@@ -185,17 +176,6 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD=supersecretpassword
 
-  # If using Nextant
-  solr:
-    image: solr:6-alpine
-    container_name: solr
-    volumes:
-      - /docker/nextcloud/solr:/opt/solr/server/solr/mycores
-    entrypoint:
-      - docker-entrypoint.sh
-      - solr-precreate
-      - nextant
-
   # If using Redis
   redis:
     image: redis:alpine
@@ -219,9 +199,6 @@ Redis can be used for distributed and file locking cache, alongside with APCu (l
    ),
 ```
 
-### How to configure Nextant
-You will have to deploy a Solr server, I've shown an example above with docker-compose. Once Nextant app is installed, go to "additional settings" in your admin pannel and use http://solr:8983/solr as "Adress of your Solr Servlet". There you go!
-
 ### Tip : how to use occ command
 There is a script for that, so you shouldn't bother to log into the container, set the right permissions, and so on. Just use `docker exec -ti nextcloud occ command`.
 

From 65ed611b48a633a5b9e235d9f053efce15c647c5 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 25 May 2020 15:20:51 +0200
Subject: [PATCH 251/328] Update Nextcloud nginx.conf

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 75ba9588..76f17985 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -3,6 +3,7 @@ server {
         root /nextcloud;
 
         fastcgi_buffers 64 4K;
+        fastcgi_hide_header X-Powered-By;
 
         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
         add_header Referrer-Policy "no-referrer" always;
@@ -25,11 +26,11 @@ server {
         rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
 
         location = /.well-known/carddav {
-            return 301 https://$host/remote.php/dav;
+            return 301 $scheme://$host:$server_port/remote.php/dav;
         }
 
         location = /.well-known/caldav {
-            return 301 https://$host/remote.php/dav;
+            return 301 $scheme://$host:$server_port/remote.php/dav;
         }
 
         location / {
@@ -49,7 +50,6 @@ server {
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             set $path_info $fastcgi_path_info;
             try_files $fastcgi_script_name =404;
-            fastcgi_hide_header X-Powered-By;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $path_info;
             fastcgi_param modHeadersAvailable true;
@@ -67,7 +67,7 @@ server {
 
         location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
             try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=7200";
+            add_header Cache-Control "public, max-age=15778463";
             add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
             add_header Referrer-Policy "no-referrer" always;
             add_header X-Content-Type-Options "nosniff" always;

From fc873db029f61f3a18307c13902dc6a1ab432e3d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 30 May 2020 13:56:28 +0200
Subject: [PATCH 252/328] Update Alpine to 3.12

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 searx/Dockerfile.Latest  | 2 +-
 searx/Dockerfile.Master  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 38e4699e..01a6e9d3 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 ENV UID=991 GID=991
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 2525f4c1..e9feb086 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 ARG BUILD_CORES
 
diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index 2afe005e..3ad57a6c 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 ARG VERSION=0.16.0
 
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index b9a65581..41214f98 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 ARG VERSION=master
 

From b1d64644680167af94d686c3a58a1c463b50fc47 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 3 Jun 2020 09:22:56 +0200
Subject: [PATCH 253/328] Update Nextcloud to final 19.0.0

---
 nextcloud/Dockerfile.19.0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 03a67436..def1afcb 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.0RC3
+ARG NEXTCLOUD_VERSION=19.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -48,9 +48,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From b650e65f6600c9ecd07a7b0af88dec55215be20b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 3 Jun 2020 09:48:04 +0200
Subject: [PATCH 254/328] Revert nginx webdav config

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 76f17985..4a6bdf7a 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -26,11 +26,11 @@ server {
         rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
 
         location = /.well-known/carddav {
-            return 301 $scheme://$host:$server_port/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location = /.well-known/caldav {
-            return 301 $scheme://$host:$server_port/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location / {

From d24f8620b6786901e400e8519a879b695cd643e7 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 5 Jun 2020 08:20:42 +0200
Subject: [PATCH 255/328] Install pip to fix build

---
 searx/Dockerfile.Latest | 5 +++--
 searx/Dockerfile.Master | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index 3ad57a6c..e63fd0e3 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -14,6 +14,7 @@ RUN apk -U upgrade \
     libxml2-dev \
     openssl-dev \
     tar \
+    py-pip \
     ca-certificates \
  && apk add \
     su-exec \
@@ -24,8 +25,8 @@ RUN apk -U upgrade \
     tini \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
- && pip3 install --upgrade setuptools pip \
- && pip3 install --no-cache -r requirements.txt \
+ && pip install --upgrade setuptools pip \
+ && pip install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \
  && rm -f /var/cache/apk/*
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index 41214f98..b4cbe62f 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -13,6 +13,7 @@ RUN apk -U upgrade \
     libxslt-dev \
     libxml2-dev \
     openssl-dev \
+    py-pip \
     git \
     ca-certificates \
  && apk add \
@@ -24,8 +25,8 @@ RUN apk -U upgrade \
     tini \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && git clone https://github.com/asciimoo/searx/ . \
- && pip3 install --upgrade setuptools pip \
- && pip3 install --no-cache -r requirements.txt \
+ && pip install --upgrade setuptools pip \
+ && pip install --no-cache -r requirements.txt \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
  && apk del build-dependencies \
  && rm -f /var/cache/apk/*

From 4df51f8a9b451e8a2742d24f880f50d15798860f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 5 Jun 2020 08:22:34 +0200
Subject: [PATCH 256/328] Fix build error

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 01a6e9d3..275039ed 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -92,7 +92,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && make -j ${NB_CORES} && make install && make clean \
  && strip -s /usr/sbin/nginx \
  && apk del build-dependencies \
- && rm -rf /tmp/* /var/cache/apk/* /root/.gnupg
+ && rm -rf /tmp/* /var/cache/apk/*
 
 COPY rootfs /
 

From 40cbbdaa4ccb0794f4d7613a0b64f9b85e61e790 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 5 Jun 2020 12:27:52 +0200
Subject: [PATCH 257/328] Update Nextcloud to 18.0.5, 17.0.7 and 16.0.11

---
 nextcloud/Dockerfile.16.0 | 2 +-
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
index ccd63360..3ba8541e 100644
--- a/nextcloud/Dockerfile.16.0
+++ b/nextcloud/Dockerfile.16.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=16.0.10
+ARG NEXTCLOUD_VERSION=16.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 4470a63e..32ba0b20 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.6
+ARG NEXTCLOUD_VERSION=17.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 779d755b..d0d9bc99 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.4
+ARG NEXTCLOUD_VERSION=18.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 743280fe20518463afcbe824c2021cde2c4788a2 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 5 Jun 2020 12:29:01 +0200
Subject: [PATCH 258/328] Update README

---
 nextcloud/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 4c60a1b4..e1d8923c 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,11 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (18.0)
-- **19.0** : latest 19.0.x version (beta)
-- **18.0** : latest 18.0.x version (stable)
-- **17.0** : latest 17.0.x version (old stable)
-- **16.0** : latest 16.0.x version (deprecated)
+- **latest** : latest stable version (19.0)
+- **19.0** : latest 19.0.x version (stable)
+- **18.0** : latest 18.0.x version (old stable)
+- **17.0** : latest 17.0.x version (deprecated)
+- ~~**16.0** : latest 16.0.x version (end-of-life)~~
 - ~~**15.0** : latest 15.0.x version (end-of-life)~~
 - ~~**14.0** : latest 14.0.x version (end-of-life)~~
 - ~~**13.0** : latest 13.0.x version (end-of-life)~~

From 3d666f9804773a010ea29c79e2006fdd093861cc Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 9 Jun 2020 15:43:07 +0200
Subject: [PATCH 259/328] Update Nextcloud to 18.0.6

---
 nextcloud/Dockerfile.18.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index d0d9bc99..2df73df9 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.5
+ARG NEXTCLOUD_VERSION=18.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From d7be9e8daeb47d31e2da677f4e60908bdeac8d0b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 12 Jun 2020 19:27:43 +0200
Subject: [PATCH 260/328] Update PHP to 7.3.19

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index e9feb086..a5a49de0 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.18
+ARG PHP_VER=7.3.19
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From eb80828442cb525375d5d9c1fd1fe98292c04408 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 19 Jun 2020 18:44:46 +0200
Subject: [PATCH 261/328] Change default cron period to 5 minutes

---
 nextcloud/Dockerfile.19.0  | 2 +-
 nextcloud/Dockerfile.daily | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index def1afcb..dfd6f665 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -12,7 +12,7 @@ ENV UID=991 GID=991 \
     PHP_START_SERVERS=2 \
     PHP_MIN_SPARE_SERVERS=1 \
     PHP_MAX_SPARE_SERVERS=6 \
-    CRON_PERIOD=15m \
+    CRON_PERIOD=5m \
     CRON_MEMORY_LIMIT=1g \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 0937e12a..a800e2a2 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -9,7 +9,7 @@ ENV UID=991 GID=991 \
     PHP_START_SERVERS=2 \
     PHP_MIN_SPARE_SERVERS=1 \
     PHP_MAX_SPARE_SERVERS=6 \
-    CRON_PERIOD=15m \
+    CRON_PERIOD=5m \
     CRON_MEMORY_LIMIT=1g \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \

From 4275ecfee6addf9695fc4973347c6906670afdd5 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 19 Jun 2020 18:47:44 +0200
Subject: [PATCH 262/328] Add ffmpeg

---
 nextcloud/Dockerfile.19.0 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index dfd6f665..0ade7d6b 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -35,6 +35,7 @@ RUN apk -U upgrade \
     ca-certificates \
     libsmbclient \
     imagemagick-libs \
+    ffmpeg-libs \
     tzdata \
  && pecl channel-update pecl.php.net \
  && pecl install \

From 62af8f55565e80bd088070824cb7ef6b4d7b183c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 20 Jun 2020 09:57:46 +0200
Subject: [PATCH 263/328] Add PHP 7.4

---
 nginx-php/Dockerfile.7.4 | 197 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 nginx-php/Dockerfile.7.4

diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
new file mode 100644
index 00000000..f958e532
--- /dev/null
+++ b/nginx-php/Dockerfile.7.4
@@ -0,0 +1,197 @@
+FROM alpine:3.12
+
+ARG BUILD_CORES
+
+ARG NGINX_VER=1.18.0
+ARG PHP_VER=7.4.7
+ARG LIBICONV_VERSION=1.16
+
+LABEL description="nginx + php image based on Alpine" \
+      maintainer="hoellen <info@hoellen.eu>" \
+      php_version="PHP v$PHP_VER built from source" \
+      nginx_version="nginx v$NGINX_VER built from source"
+
+ARG PHP_MIRROR=http://ch1.php.net
+
+ARG NGINX_CONF=" \
+    --prefix=/nginx \
+    --sbin-path=/usr/local/sbin/nginx \
+    --http-log-path=/nginx/logs/access.log \
+    --error-log-path=/nginx/logs/error.log \
+    --pid-path=/nginx/run/nginx.pid \
+    --lock-path=/nginx/run/nginx.lock \
+    --with-threads \
+    --with-file-aio \
+    --without-http_geo_module \
+    --without-http_autoindex_module \
+    --without-http_split_clients_module \
+    --without-http_memcached_module \
+    --without-http_empty_gif_module \
+    --without-http_browser_module"
+
+ARG PHP_CONF=" \
+    --prefix=/usr \
+    --libdir=/usr/lib/php \
+    --datadir=/usr/share/php \
+    --sysconfdir=/php/etc \
+    --localstatedir=/php/var \
+    --with-pear=/usr/share/php \
+    --with-config-file-scan-dir=/php/conf.d \
+    --with-config-file-path=/php \
+    --with-pic \
+    --disable-short-tags \
+    --without-readline \
+    --enable-bcmath \
+    --enable-fpm \
+    --disable-cgi \
+    --enable-mysqlnd \
+    --enable-mbstring \
+    --enable-gd \
+    --with-curl \
+    --with-libedit \
+    --with-openssl \
+    --with-password-argon2 \
+    --with-iconv=/usr/local \
+    --with-jpeg \
+    --with-webp \
+    --with-xpm=no \
+    --with-freetype \
+    --disable-gd-jis-conv \
+    --with-zlib"
+
+ARG PHP_EXT_LIST=" \
+    mysqli \
+    ctype \
+    dom \
+    json \
+    xml \
+    mbstring \
+    posix \
+    xmlwriter \
+    zip \
+    zlib \
+    sqlite3 \
+    pdo_sqlite \
+    pdo_pgsql \
+    pdo_mysql \
+    pcntl \
+    curl \
+    fileinfo \
+    bz2 \
+    intl \
+    openssl \
+    ldap \
+    simplexml \
+    pgsql \
+    ftp \
+    exif \
+    gmp \
+    imap"
+
+ARG CUSTOM_BUILD_PKGS=" \
+    freetype-dev \
+    openldap-dev \
+    gmp-dev \
+    icu-dev \
+    postgresql-dev \
+    libwebp-dev \
+    libjpeg-turbo-dev \
+    libxpm-dev \
+    libedit-dev \
+    libxml2-dev \
+    openssl-dev \
+    libbz2 \
+    sqlite-dev \
+    imap-dev \
+    argon2-dev"
+
+ARG CUSTOM_PKGS=" \
+    freetype \
+    openldap \
+    gmp \
+    oniguruma \
+    bzip2-dev \
+    icu \
+    libpq \
+    sqlite-libs \
+    argon2-libs \
+    c-client"
+
+COPY rootfs /
+
+RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
+#
+### Packages installation
+ && BUILD_DEPS=" \
+    linux-headers \
+    libtool \
+    build-base \
+    pcre-dev \
+    zlib-dev \
+    libzip-dev \
+    libpng-dev \
+    gd-dev \
+    wget \
+    gnupg \
+    autoconf \
+    gcc \
+    g++ \
+    libc-dev \
+    make \
+    pkgconf \
+    curl-dev \
+    oniguruma-dev \
+    ca-certificates \
+    ${CUSTOM_BUILD_PKGS}" \
+ && apk -U add \
+    ${BUILD_DEPS} \
+    s6 \
+    su-exec \
+    curl \
+    libedit \
+    libxml2 \
+    openssl \
+    libwebp \
+    libzip \
+    gd \
+    pcre \
+    zlib \
+    ${CUSTOM_PKGS} \
+#
+### Source downloading
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
+ && wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
+ && wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz.asc/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz.asc \
+ && wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz -O /tmp/libiconv-${LIBICONV_VERSION}.tar.gz \
+ && mkdir -p /php/conf.d \
+ && mkdir -p /usr/src \
+ && tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
+ && tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
+ && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
+#
+### nginx installation
+ && cd /usr/src/nginx-${NGINX_VER} \
+ && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+### GNU Libiconv installation
+ && cd /usr/src/libiconv-${LIBICONV_VERSION} \
+ && ./configure --prefix=/usr/local \
+ && make && make install && libtool --finish /usr/local/lib \
+#
+### PHP installation
+ && mv /usr/src/php-${PHP_VER} /usr/src/php \
+ && cd /usr/src/php \
+ && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
+ && make -j ${NB_CORES} \
+ && make install \
+#
+### Strip, clean, install modules
+ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
+ && make clean \
+ && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \
+ && docker-php-ext-install ${PHP_EXT_LIST} \
+ && apk del ${BUILD_DEPS} \
+ && rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
+ && mkdir -p /nginx/logs /nginx/run /php/php-fpm.d /php/logs /php/run /php/session

From eda8a6eee2f48325b765f8c21a0ff0d833ee4407 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 20 Jun 2020 09:58:43 +0200
Subject: [PATCH 264/328] Use PHP 7.4 for Nextcloud 19.0

---
 nextcloud/Dockerfile.19.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 0ade7d6b..dbdf013c 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.3
+FROM hoellen/nginx-php:7.4
 
 ARG NEXTCLOUD_VERSION=19.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

From 832c073d5f243dc91b9195303cebf21c7ef2612d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 20 Jun 2020 10:26:07 +0200
Subject: [PATCH 265/328] Sync daily Dockerfile with 19.0

---
 nextcloud/Dockerfile.19.0  | 2 +-
 nextcloud/Dockerfile.daily | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index dbdf013c..0e55beb4 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -35,7 +35,7 @@ RUN apk -U upgrade \
     ca-certificates \
     libsmbclient \
     imagemagick-libs \
-    ffmpeg-libs \
+    ffmpeg \
     tzdata \
  && pecl channel-update pecl.php.net \
  && pecl install \
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index a800e2a2..779e3a59 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.3
+FROM hoellen/nginx-php:7.4
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \
@@ -32,6 +32,7 @@ RUN apk -U upgrade \
     ca-certificates \
     libsmbclient \
     imagemagick-libs \
+    ffmpeg \
     tzdata \
  && pecl channel-update pecl.php.net \
  && pecl install \
@@ -53,13 +54,13 @@ RUN apk -U upgrade \
  && tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \
  && update-ca-certificates \
  && apk del build-dependencies \
- && rm -rf /var/cache/apk/* /tmp/*
+ && 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 /php/session
+VOLUME /data /config /apps2 /nextcloud/themes
 
 EXPOSE 8888
 

From 5caafcd13c18a32c08f9488fceb987fe0519ea8b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 28 Jun 2020 18:47:10 +0200
Subject: [PATCH 266/328] Fix SVG convert for mail

---
 nextcloud/Dockerfile.19.0  | 2 +-
 nextcloud/Dockerfile.daily | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 0e55beb4..e9186b05 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -34,7 +34,7 @@ RUN apk -U upgrade \
     libressl \
     ca-certificates \
     libsmbclient \
-    imagemagick-libs \
+    imagemagick \
     ffmpeg \
     tzdata \
  && pecl channel-update pecl.php.net \
diff --git a/nextcloud/Dockerfile.daily b/nextcloud/Dockerfile.daily
index 779e3a59..5a82a86a 100644
--- a/nextcloud/Dockerfile.daily
+++ b/nextcloud/Dockerfile.daily
@@ -31,7 +31,7 @@ RUN apk -U upgrade \
     libressl \
     ca-certificates \
     libsmbclient \
-    imagemagick-libs \
+    imagemagick \
     ffmpeg \
     tzdata \
  && pecl channel-update pecl.php.net \

From e7be762a686044c80b35b7615622cf08e7815dd9 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 9 Jul 2020 18:32:06 +0200
Subject: [PATCH 267/328] Update searx to 0.17.0

---
 searx/Dockerfile.Latest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index e63fd0e3..3aecc057 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -1,6 +1,6 @@
 FROM alpine:3.12
 
-ARG VERSION=0.16.0
+ARG VERSION=0.17.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991

From 2df2b869b807edb4ec57d3456202a60f2ef32c22 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 9 Jul 2020 18:49:05 +0200
Subject: [PATCH 268/328] Update PHP

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index a5a49de0..78fd4d07 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.19
+ARG PHP_VER=7.3.20
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index f958e532..b26bca5b 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.7
+ARG PHP_VER=7.4.8
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
@@ -85,6 +85,7 @@ ARG PHP_EXT_LIST=" \
     pgsql \
     ftp \
     exif \
+    bcmath \
     gmp \
     imap"
 

From d5cf7479ba12441ad639d0294f1f9ee09ac7081c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 16 Jul 2020 23:00:49 +0200
Subject: [PATCH 269/328] Update Nextcloud to 19.0.1, 18.0.7 and 17.0.8

Also remove end-of-life version 16.
---
 nextcloud/Dockerfile.16.0 | 82 ---------------------------------------
 nextcloud/Dockerfile.17.0 |  2 +-
 nextcloud/Dockerfile.18.0 |  2 +-
 nextcloud/Dockerfile.19.0 |  2 +-
 4 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.16.0

diff --git a/nextcloud/Dockerfile.16.0 b/nextcloud/Dockerfile.16.0
deleted file mode 100644
index 3ba8541e..00000000
--- a/nextcloud/Dockerfile.16.0
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=16.0.11
-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 \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick-libs \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.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/* \
- && sed -i '/SAMEORIGIN/d' /nginx/sites-enabled/nginx.conf
-
-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.17.0 b/nextcloud/Dockerfile.17.0
index 32ba0b20..6d31d9c3 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.7
+ARG NEXTCLOUD_VERSION=17.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 2df73df9..694fef64 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.6
+ARG NEXTCLOUD_VERSION=18.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index e9186b05..628011c5 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=19.0.0
+ARG NEXTCLOUD_VERSION=19.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 3e8854d1307dc9eb7d5bccffcab66275eed7ff7b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 20 Jul 2020 09:01:23 +0200
Subject: [PATCH 270/328] Fix deletion of python requests module (#40)

---
 searx/Dockerfile.Latest | 2 +-
 searx/Dockerfile.Master | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index 3aecc057..496b97cc 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -14,11 +14,11 @@ RUN apk -U upgrade \
     libxml2-dev \
     openssl-dev \
     tar \
-    py-pip \
     ca-certificates \
  && apk add \
     su-exec \
     python3 \
+    py-pip \
     libxml2 \
     libxslt \
     openssl \
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index b4cbe62f..fa8af614 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -13,12 +13,12 @@ RUN apk -U upgrade \
     libxslt-dev \
     libxml2-dev \
     openssl-dev \
-    py-pip \
     git \
     ca-certificates \
  && apk add \
     su-exec \
     python3 \
+    py-pip \
     libxml2 \
     libxslt \
     openssl \

From dbcd8dc625da2ed293f06be089fa7085de0863d8 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 6 Aug 2020 13:31:49 +0200
Subject: [PATCH 271/328] Update PHP to 7.4.9 and 7.3.21

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 78fd4d07..6e4a638a 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.20
+ARG PHP_VER=7.3.21
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index b26bca5b..9ca32b55 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.8
+ARG PHP_VER=7.4.9
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From cdd79d6f7715c11fd954b0bb989f32daa02aec16 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 27 Aug 2020 11:08:12 +0200
Subject: [PATCH 272/328] Update Nextcloud to 19.0.2, 18.0.8 and 17.0.9

---
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 6d31d9c3..74f65bce 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.8
+ARG NEXTCLOUD_VERSION=17.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.18.0 b/nextcloud/Dockerfile.18.0
index 694fef64..33520ccc 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.7
+ARG NEXTCLOUD_VERSION=18.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 628011c5..ff24e6da 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=19.0.1
+ARG NEXTCLOUD_VERSION=19.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 197ebea55825513c242b66910760f390125a76df Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 3 Sep 2020 13:36:51 +0200
Subject: [PATCH 273/328] Update PHP to 7.4.10 and 7.3.22

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 6e4a638a..ac59b896 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.21
+ARG PHP_VER=7.3.22
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 9ca32b55..2ed4e299 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.9
+ARG PHP_VER=7.4.10
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From b0dd747a03b6ecd127d70e157411d952ddfe78f5 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 10 Sep 2020 21:17:13 +0200
Subject: [PATCH 274/328] Update Nextcloud to 19.0.3 and 18.0.9

---
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 33520ccc..852fc8d5 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.8
+ARG NEXTCLOUD_VERSION=18.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.19.0 b/nextcloud/Dockerfile.19.0
index ff24e6da..6ea6576a 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=19.0.2
+ARG NEXTCLOUD_VERSION=19.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From b7860ff71df8ce19a89d86b7e6d93e962e616a6f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 18 Sep 2020 11:19:58 +0200
Subject: [PATCH 275/328] Add Nextcloud 20-RC1

---
 nextcloud/Dockerfile.20.0 | 82 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 nextcloud/Dockerfile.20.0

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
new file mode 100644
index 00000000..2b1f1e27
--- /dev/null
+++ b/nextcloud/Dockerfile.20.0
@@ -0,0 +1,82 @@
+FROM hoellen/nginx-php:7.4
+
+ARG NEXTCLOUD_VERSION=20.0.0RC1
+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=5m \
+    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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick \
+    ffmpeg \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
+ && mkdir /nextcloud \
+ && cd /tmp \
+ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From c8cbf674896fe85bc6c89ca24878ad6d16132e96 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 24 Sep 2020 22:51:46 +0200
Subject: [PATCH 276/328] Update Nextcloud 20.0-RC2

---
 nextcloud/Dockerfile.20.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 2b1f1e27..84cd6ca1 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.0RC1
+ARG NEXTCLOUD_VERSION=20.0.0RC2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 53d416f4fc305e30cb791bd2a03231edcf9b35f3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 1 Oct 2020 16:27:28 +0200
Subject: [PATCH 277/328] Update PHP to 7.4.11 and 7.3.23

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index ac59b896..b267f292 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.22
+ARG PHP_VER=7.3.23
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 2ed4e299..4b4c2f3d 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.10
+ARG PHP_VER=7.4.11
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 2944908bae2891a22fdefae9edb4e43d6c77103e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 3 Oct 2020 12:17:43 +0200
Subject: [PATCH 278/328] Add Nextcloud 20.0 - Final Release

---
 nextcloud/Dockerfile.20.0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 84cd6ca1..4b63902c 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.0RC2
+ARG NEXTCLOUD_VERSION=20.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -49,9 +49,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \

From 582a14d737872c5bab10e93b090935631a877835 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Mon, 5 Oct 2020 13:38:11 +0200
Subject: [PATCH 279/328] Version 17 is EOL and 20 is the new stable

See https://docs.nextcloud.com/server/20/admin_manual/release_schedule.html
---
 nextcloud/README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index e1d8923c..3ac9cc89 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (19.0)
-- **19.0** : latest 19.0.x version (stable)
-- **18.0** : latest 18.0.x version (old stable)
-- **17.0** : latest 17.0.x version (deprecated)
+- **latest** : latest stable version (20.0)
+- **20.0** : latest 20.0.x version (stable)
+- **19.0** : latest 19.0.x version (old stable)
+- **18.0** : latest 18.0.x version (deprecated)
+- ~~**17.0** : latest 17.0.x version (end-of-life)~~
 - ~~**16.0** : latest 16.0.x version (end-of-life)~~
 - ~~**15.0** : latest 15.0.x version (end-of-life)~~
 - ~~**14.0** : latest 14.0.x version (end-of-life)~~

From 5f65a6acc5297cf957396c8c77e0566162b2f4a9 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 6 Oct 2020 12:54:10 +0200
Subject: [PATCH 280/328] Use temporary PHP 7.3 for Nextcloud images

---
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 6ea6576a..8bd5e041 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.4
+FROM hoellen/nginx-php:7.3
 
 ARG NEXTCLOUD_VERSION=19.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 4b63902c..5c3ab7e3 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.4
+FROM hoellen/nginx-php:7.3
 
 ARG NEXTCLOUD_VERSION=20.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

From 53f390a388ac854eff3c24a6d8ec09874ef32887 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 9 Oct 2020 16:57:16 +0200
Subject: [PATCH 281/328] Update Nextcloud to 19.0.4, 18.0.10 and 17.0.10

---
 nextcloud/Dockerfile.17.0 | 2 +-
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
index 74f65bce..a900f236 100644
--- a/nextcloud/Dockerfile.17.0
+++ b/nextcloud/Dockerfile.17.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=17.0.9
+ARG NEXTCLOUD_VERSION=17.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 852fc8d5..a3c94638 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.9
+ARG NEXTCLOUD_VERSION=18.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 8bd5e041..9a4d7c9a 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.3
+ARG NEXTCLOUD_VERSION=19.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 0c609dc19f12b030a1246293134d7f0edd5a0825 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 25 Oct 2020 08:49:13 +0100
Subject: [PATCH 282/328] Update Nextcloud to 20.0.1

---
 nextcloud/Dockerfile.20.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 5c3ab7e3..d6c724c3 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=20.0.0
+ARG NEXTCLOUD_VERSION=20.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From ffb008656ee385c65ed0fe835d15293937be49b3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 2 Nov 2020 09:28:39 +0100
Subject: [PATCH 283/328] Update PHP to 7.4.12 and 7.3.24

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index b267f292..b8c9ac63 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.23
+ARG PHP_VER=7.3.24
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 4b4c2f3d..198f24dc 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.11
+ARG PHP_VER=7.4.12
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From c76a3cbebd858e085dc7cbcc020e48e9ac35f180 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 19 Nov 2020 09:27:29 +0100
Subject: [PATCH 284/328] Update Nextcloud to 20.0.2, 19.0.5 and 18.0.11

---
 nextcloud/Dockerfile.17.0 | 81 ---------------------------------------
 nextcloud/Dockerfile.18.0 |  2 +-
 nextcloud/Dockerfile.19.0 |  2 +-
 nextcloud/Dockerfile.20.0 |  2 +-
 4 files changed, 3 insertions(+), 84 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.17.0

diff --git a/nextcloud/Dockerfile.17.0 b/nextcloud/Dockerfile.17.0
deleted file mode 100644
index a900f236..00000000
--- a/nextcloud/Dockerfile.17.0
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=17.0.10
-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 \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick-libs \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.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.18.0 b/nextcloud/Dockerfile.18.0
index a3c94638..319a86f2 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.10
+ARG NEXTCLOUD_VERSION=18.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 9a4d7c9a..45751c51 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.4
+ARG NEXTCLOUD_VERSION=19.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index d6c724c3..79405ac7 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=20.0.1
+ARG NEXTCLOUD_VERSION=20.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 99370900d1eb44301ae086c4a6b2d07acac1cd0a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 9 Dec 2020 23:51:28 +0100
Subject: [PATCH 285/328] Update Nextcloud to 20.0.3, 19.0.6 and 18.0.12

---
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 319a86f2..56c7f076 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.11
+ARG NEXTCLOUD_VERSION=18.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 45751c51..b70b3f22 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.5
+ARG NEXTCLOUD_VERSION=19.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 79405ac7..e44e3e79 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=20.0.2
+ARG NEXTCLOUD_VERSION=20.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 39e5c9c9306b8fc74d06c7e19dddd1ce6b38aa77 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 16 Dec 2020 18:10:00 +0100
Subject: [PATCH 286/328] Update Nextcloud to 20.0.4

---
 nextcloud/Dockerfile.20.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index e44e3e79..7ce841f7 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=20.0.3
+ARG NEXTCLOUD_VERSION=20.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 3a26ffb087f7d4a91afa18158b8031714f208bf0 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 3 Jan 2021 13:07:45 +0100
Subject: [PATCH 287/328] Use proxy forwarded headers if available for
 /.well-known redirects

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 4a6bdf7a..ddc44709 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -1,3 +1,13 @@
+map $http_x_forwarded_port $nc_port {
+  default "$http_x_forwarded_port";
+  ''      "$server_port";
+}
+
+map $http_x_forwarded_proto $nc_proto {
+  default "$http_x_forwarded_proto";
+  ''      "$scheme";
+}
+
 server {
         listen 8888;
         root /nextcloud;
@@ -26,11 +36,11 @@ server {
         rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
 
         location = /.well-known/carddav {
-            return 301 https://$host/remote.php/dav;
+            return 301 $nc_proto://$host:$nc_port/remote.php/dav;
         }
 
         location = /.well-known/caldav {
-            return 301 https://$host/remote.php/dav;
+            return 301 $nc_proto://$host:$nc_port/remote.php/dav;
         }
 
         location / {

From b60120888d0d340f4f88fb2a3cf711dc732748af Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 3 Jan 2021 13:25:23 +0100
Subject: [PATCH 288/328] Check for UID/GID and add nextcloud user

---
 nextcloud/rootfs/usr/local/bin/run.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nextcloud/rootfs/usr/local/bin/run.sh b/nextcloud/rootfs/usr/local/bin/run.sh
index aea112cb..3adf2b38 100644
--- a/nextcloud/rootfs/usr/local/bin/run.sh
+++ b/nextcloud/rootfs/usr/local/bin/run.sh
@@ -37,6 +37,14 @@ for dir in /nextcloud /data /config /apps2 /var/log /php /nginx /tmp /etc/s6.d;
 done
 echo "Done updating permissions."
 
+echo "Check for UserID ${UID}"
+if ! $(grep ":${UID}:" /etc/passwd 1>/dev/null 2>&1); then
+   echo "Creating user nextcloud with UID=${UID} and GID=${GID}."
+   /usr/sbin/adduser -g ${GID} -u ${UID} --disabled-password  --gecos "" nextcloud
+else
+   echo "An existing user with UID=${UID} was found, nothing to do."
+fi
+
 if [ ! -f /config/config.php ]; then
     # New installation, run the setup
     /usr/local/bin/setup.sh

From ed47c8a632451a3832a6b489198f615d607df8d5 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 3 Jan 2021 13:26:57 +0100
Subject: [PATCH 289/328] Use PHP 7.4 again for Nextcloud 20

see hoellen/dockerfiles#44
---
 nextcloud/Dockerfile.20.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 7ce841f7..2a64998a 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,4 +1,4 @@
-FROM hoellen/nginx-php:7.3
+FROM hoellen/nginx-php:7.4
 
 ARG NEXTCLOUD_VERSION=20.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

From ff350c8c7a1aef639d0e9b5878a8b7bbe61ca9dc Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 3 Jan 2021 14:02:27 +0100
Subject: [PATCH 290/328] Revert .well-known redirects

This reverts commit 3a26ffb087f7d4a91afa18158b8031714f208bf0.
---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index ddc44709..4a6bdf7a 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -1,13 +1,3 @@
-map $http_x_forwarded_port $nc_port {
-  default "$http_x_forwarded_port";
-  ''      "$server_port";
-}
-
-map $http_x_forwarded_proto $nc_proto {
-  default "$http_x_forwarded_proto";
-  ''      "$scheme";
-}
-
 server {
         listen 8888;
         root /nextcloud;
@@ -36,11 +26,11 @@ server {
         rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
 
         location = /.well-known/carddav {
-            return 301 $nc_proto://$host:$nc_port/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location = /.well-known/caldav {
-            return 301 $nc_proto://$host:$nc_port/remote.php/dav;
+            return 301 https://$host/remote.php/dav;
         }
 
         location / {

From c0ae52497bc031b2a35409771a447ef0ff2c220e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 7 Jan 2021 13:13:39 +0100
Subject: [PATCH 291/328] Update PHP to 7.4.14 and 7.3.26

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index b8c9ac63..37727e73 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.24
+ARG PHP_VER=7.3.26
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 198f24dc..9bcd4d44 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.12
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.12
+ARG PHP_VER=7.4.14
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 933259ae755a7ec2519806d453564f55ae413b58 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 14 Jan 2021 16:50:08 +0100
Subject: [PATCH 292/328] Update Nextcloud to 20.0.5, 19.0.7 and 18.0.13

---
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index 56c7f076..f8e121ab 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.12
+ARG NEXTCLOUD_VERSION=18.0.13
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index b70b3f22..a0de1fbe 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.6
+ARG NEXTCLOUD_VERSION=19.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 2a64998a..15efe7de 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.4
+ARG NEXTCLOUD_VERSION=20.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 456833200daf9e4ac9150c22e5ddbbc6e511ea7a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 16 Jan 2021 10:53:55 +0100
Subject: [PATCH 293/328] Update Alpine base image to 3.13

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 37727e73..0ee4a736 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 9bcd4d44..31599362 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 ARG BUILD_CORES
 

From 564b517ecec4cc241ff4e25f0ceec55b3b53fa7e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 18 Jan 2021 10:24:20 +0100
Subject: [PATCH 294/328] Update searx and alpine base image

---
 boring-nginx/Dockerfile | 2 +-
 searx/Dockerfile.Latest | 4 ++--
 searx/Dockerfile.Master | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 275039ed..a3262c23 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 ENV UID=991 GID=991
 
diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index 496b97cc..f9ecfbbb 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -1,6 +1,6 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
-ARG VERSION=0.17.0
+ARG VERSION=0.18.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991
diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index fa8af614..fcb11655 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 ARG VERSION=master
 

From 3cc1ca6a0953b56fecd2eab270e7e64cc94e7ef1 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 18 Jan 2021 11:05:24 +0100
Subject: [PATCH 295/328] Fix searx master build

---
 searx/Dockerfile.Master | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/searx/Dockerfile.Master b/searx/Dockerfile.Master
index fcb11655..25c321d5 100644
--- a/searx/Dockerfile.Master
+++ b/searx/Dockerfile.Master
@@ -12,6 +12,8 @@ RUN apk -U upgrade \
     libffi-dev \
     libxslt-dev \
     libxml2-dev \
+		protoc \
+		protobuf-dev \
     openssl-dev \
     git \
     ca-certificates \
@@ -19,6 +21,7 @@ RUN apk -U upgrade \
     su-exec \
     python3 \
     py-pip \
+		protobuf \
     libxml2 \
     libxslt \
     openssl \

From 852f8ab50149ebb84d33f58bb844878fe8701379 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 26 Jan 2021 11:21:43 +0100
Subject: [PATCH 296/328] Update Nextcloud to 20.0.6, 19.0.8 and 18.0.14

---
 nextcloud/Dockerfile.18.0 | 2 +-
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
index f8e121ab..1ee2c68c 100644
--- a/nextcloud/Dockerfile.18.0
+++ b/nextcloud/Dockerfile.18.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=18.0.13
+ARG NEXTCLOUD_VERSION=18.0.14
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index a0de1fbe..06da7aea 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.7
+ARG NEXTCLOUD_VERSION=19.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 15efe7de..42a9d474 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.5
+ARG NEXTCLOUD_VERSION=20.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 10d5df07c68bddcd245dc9f50d9add2d555e1f65 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Wed, 3 Feb 2021 23:41:22 +0100
Subject: [PATCH 297/328] Update Nextcloud to 20.0.7

---
 nextcloud/Dockerfile.20.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 42a9d474..c0adf445 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.6
+ARG NEXTCLOUD_VERSION=20.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 6237e0f65956bdc01283d4d9f3c06e57a8ce771d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Feb 2021 14:01:41 +0100
Subject: [PATCH 298/328] Update PHP to 7.4.15 and 7.3.27

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 0ee4a736..ed9d2610 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.26
+ARG PHP_VER=7.3.27
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 31599362..81638d88 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.14
+ARG PHP_VER=7.4.15
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From f93d2f86df67853acc899461e026ccea4aa29414 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 11 Feb 2021 20:32:55 +0100
Subject: [PATCH 299/328] Add Nextcloud 21 RC2

---
 nextcloud/Dockerfile.21.0 | 82 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 nextcloud/Dockerfile.21.0

diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
new file mode 100644
index 00000000..f62b96bf
--- /dev/null
+++ b/nextcloud/Dockerfile.21.0
@@ -0,0 +1,82 @@
+FROM hoellen/nginx-php:7.4
+
+ARG NEXTCLOUD_VERSION=21.0.0RC2
+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=5m \
+    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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick \
+    ffmpeg \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
+ && mkdir /nextcloud \
+ && cd /tmp \
+ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/prereleases/${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"]

From e84793be28b1e8fc1c44de7984110c8793c16f75 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 11 Feb 2021 20:37:08 +0100
Subject: [PATCH 300/328] Update nginx config for Nextcloud

---
 nextcloud/rootfs/nginx/sites-enabled/nginx.conf | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
index 4a6bdf7a..33d0d25f 100644
--- a/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
+++ b/nextcloud/rootfs/nginx/sites-enabled/nginx.conf
@@ -21,17 +21,11 @@ server {
             access_log off;
         }
 
-        rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
-        rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
-        rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
+        location = /.well-known/carddav { return 301 https://$host/remote.php/dav; }
+        location = /.well-known/caldav  { return 301 https://$host/remote.php/dav; }
 
-        location = /.well-known/carddav {
-            return 301 https://$host/remote.php/dav;
-        }
-
-        location = /.well-known/caldav {
-            return 301 https://$host/remote.php/dav;
-        }
+        # Anything else is dynamically handled by Nextcloud
+        location ^~ /.well-known  { return 301 https://$host/index.php$uri; }
 
         location / {
             rewrite ^ /index.php;

From ad93bae8e2c259ea04edef809076df24c5e8ca5f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 22 Feb 2021 13:12:24 +0100
Subject: [PATCH 301/328] Update to Nextcloud 21 and remove 18 (end-of-life)

---
 nextcloud/Dockerfile.18.0 | 81 ---------------------------------------
 nextcloud/Dockerfile.21.0 |  8 ++--
 nextcloud/README.md       |  9 +++--
 3 files changed, 9 insertions(+), 89 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.18.0

diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
deleted file mode 100644
index 1ee2c68c..00000000
--- a/nextcloud/Dockerfile.18.0
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=18.0.14
-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 \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick-libs \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.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.21.0 b/nextcloud/Dockerfile.21.0
index f62b96bf..c4853670 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.0RC2
+ARG NEXTCLOUD_VERSION=21.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -49,9 +49,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && 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) \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 3ac9cc89..d5f476e6 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (20.0)
-- **20.0** : latest 20.0.x version (stable)
-- **19.0** : latest 19.0.x version (old stable)
-- **18.0** : latest 18.0.x version (deprecated)
+- **latest** : latest stable version (21.0)
+- **21.0** : latest 20.0.x version (stable)
+- **20.0** : latest 20.0.x version (old stable)
+- **19.0** : latest 19.0.x version (deprecated)
+- ~~**18.0** : latest 18.0.x version (end-of-life)~~
 - ~~**17.0** : latest 17.0.x version (end-of-life)~~
 - ~~**16.0** : latest 16.0.x version (end-of-life)~~
 - ~~**15.0** : latest 15.0.x version (end-of-life)~~

From 27de5b38dcbaac9df24390db74025061e3233c3c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 23 Feb 2021 08:59:03 +0100
Subject: [PATCH 302/328] Enable APCu data cache on cli

see recommendation: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html#id1
---
 nextcloud/rootfs/php/conf.d/apcu.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nextcloud/rootfs/php/conf.d/apcu.ini b/nextcloud/rootfs/php/conf.d/apcu.ini
index 1bf9b49d..145b47e6 100644
--- a/nextcloud/rootfs/php/conf.d/apcu.ini
+++ b/nextcloud/rootfs/php/conf.d/apcu.ini
@@ -1,4 +1,5 @@
 extension=apcu.so
 apc.enabled=1
+apc.enable_cli=1
 apc.shm_size=<APC_SHM_SIZE>
 apc.ttl=7200

From 1cff5f641e8fdca9b01cafdedbab9d25be08e6cf Mon Sep 17 00:00:00 2001
From: waja <waja@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:39:33 +0100
Subject: [PATCH 303/328] Update Nextcloud to 20.0.8 and 19.0.9 (#48)

* Update Nextcloud to 20.0.8
* Update Nextcloud to 19.0.9
---
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 06da7aea..78c1bf4d 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.8
+ARG NEXTCLOUD_VERSION=19.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.20.0 b/nextcloud/Dockerfile.20.0
index c0adf445..20b62be6 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.7
+ARG NEXTCLOUD_VERSION=20.0.8
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 4ddcebb6af3cb6f81db533bc351732e35a7a0104 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 4 Mar 2021 23:36:35 +0100
Subject: [PATCH 304/328] Update PHP to 7.4.16 and 7.3.28

---
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index ed9d2610..9bdbe5aa 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.3.27
+ARG PHP_VER=7.3.28
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 81638d88..2ce41e3c 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.18.0
-ARG PHP_VER=7.4.15
+ARG PHP_VER=7.4.16
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 3b382aba8f364b22aaedeb494c65fc5f47bc553b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sun, 28 Mar 2021 18:48:22 +0200
Subject: [PATCH 305/328] Update searx to 1.0.0

---
 searx/Dockerfile.Latest | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/searx/Dockerfile.Latest b/searx/Dockerfile.Latest
index f9ecfbbb..b108624a 100644
--- a/searx/Dockerfile.Latest
+++ b/searx/Dockerfile.Latest
@@ -1,6 +1,6 @@
 FROM alpine:3.13
 
-ARG VERSION=0.18.0
+ARG VERSION=1.0.0
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991
@@ -12,6 +12,8 @@ RUN apk -U upgrade \
     libffi-dev \
     libxslt-dev \
     libxml2-dev \
+		protoc \
+		protobuf-dev \
     openssl-dev \
     tar \
     ca-certificates \
@@ -19,6 +21,7 @@ RUN apk -U upgrade \
     su-exec \
     python3 \
     py-pip \
+		protobuf \
     libxml2 \
     libxslt \
     openssl \

From dc3c70173e34aeefbd31adfac65a2ecd7b822c9e Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Mon, 5 Apr 2021 20:29:02 +0200
Subject: [PATCH 306/328] Update PrivateBin to 1.3.5

---
 privatebin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 98c97cd6..649fd533 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php
 
-ARG PRIVATEBIN_VER=1.3.4
+ARG PRIVATEBIN_VER=1.3.5
 
 ENV GID=991 UID=991 \
     UPLOAD_MAX_SIZE=10M \

From 47969b1115acf6d94b7a2daddd4d48b1f96fc219 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 9 Apr 2021 11:23:04 +0200
Subject: [PATCH 307/328] Update Nextcloud to 21.0.1, 20.0.9 and 19.0.10

---
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 nextcloud/Dockerfile.21.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 78c1bf4d..5afab333 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.9
+ARG NEXTCLOUD_VERSION=19.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 20b62be6..56f64989 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.8
+ARG NEXTCLOUD_VERSION=20.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.21.0 b/nextcloud/Dockerfile.21.0
index c4853670..6831c440 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.0
+ARG NEXTCLOUD_VERSION=21.0.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From f2141a12894803b639a0a5aaf629897abcfc0f8d Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 20 Apr 2021 17:01:43 +0200
Subject: [PATCH 308/328] Update nginx to 1.20.0

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index a3262c23..2310e37e 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.18.0
+ARG NGINX_VERSION=1.20.0
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 9bdbe5aa..e675bdc6 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.18.0
+ARG NGINX_VER=1.20.0
 ARG PHP_VER=7.3.28
 ARG LIBICONV_VERSION=1.16
 
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 2ce41e3c..e4778dec 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.18.0
+ARG NGINX_VER=1.20.0
 ARG PHP_VER=7.4.16
 ARG LIBICONV_VERSION=1.16
 

From ca8ae7b6b04faa751a40e5ea846c831b9f22fd85 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 7 May 2021 16:36:05 +0200
Subject: [PATCH 309/328] Update Nextcloud to 21.0.2, 20.0.10 and 19.0.11

---
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 nextcloud/Dockerfile.21.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index 5afab333..daf333db 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.10
+ARG NEXTCLOUD_VERSION=19.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 56f64989..30c74225 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.9
+ARG NEXTCLOUD_VERSION=20.0.10
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index 6831c440..7582a4ec 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.1
+ARG NEXTCLOUD_VERSION=21.0.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 1d35e88fd81621eb7101bff0510eaad9b9d571e3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 25 May 2021 18:38:13 +0200
Subject: [PATCH 310/328] Update NGINX to 1.20.1

---
 boring-nginx/Dockerfile  | 2 +-
 nginx-php/Dockerfile.7.3 | 2 +-
 nginx-php/Dockerfile.7.4 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index 2310e37e..e1235589 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ENV UID=991 GID=991
 
-ARG NGINX_VERSION=1.20.0
+ARG NGINX_VERSION=1.20.1
 ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8"
 ARG BUILD_CORES
 
diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index e675bdc6..4dfc87c7 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.20.0
+ARG NGINX_VER=1.20.1
 ARG PHP_VER=7.3.28
 ARG LIBICONV_VERSION=1.16
 
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index e4778dec..8d29f340 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -2,7 +2,7 @@ FROM alpine:3.13
 
 ARG BUILD_CORES
 
-ARG NGINX_VER=1.20.0
+ARG NGINX_VER=1.20.1
 ARG PHP_VER=7.4.16
 ARG LIBICONV_VERSION=1.16
 

From 6b51fc51588b3904c39ae8ab9c6618e023e77c5f Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 3 Jun 2021 13:55:46 +0200
Subject: [PATCH 311/328] Update PHP to 7.4.20

---
 nginx-php/Dockerfile.7.4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 8d29f340..c78b74f6 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.4.16
+ARG PHP_VER=7.4.20
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 7d67efecdc8980b8ff582d5ee5d72a8e0abfdeb7 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 15 Jun 2021 08:19:37 +0200
Subject: [PATCH 312/328] Update Nextcloud 19.0 to 19.0.12

---
 nextcloud/Dockerfile.19.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index daf333db..cbe4ec1d 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.11
+ARG NEXTCLOUD_VERSION=19.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From e67594a7c398e1c32dc28fce661232c40f655d9a Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 1 Jul 2021 12:00:25 +0200
Subject: [PATCH 313/328] Update Nextcloud to 21.0.3, 20.0.11 and 19.0.13

---
 nextcloud/Dockerfile.19.0 | 2 +-
 nextcloud/Dockerfile.20.0 | 2 +-
 nextcloud/Dockerfile.21.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
index cbe4ec1d..a8f7e3c0 100644
--- a/nextcloud/Dockerfile.19.0
+++ b/nextcloud/Dockerfile.19.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.3
 
-ARG NEXTCLOUD_VERSION=19.0.12
+ARG NEXTCLOUD_VERSION=19.0.13
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 30c74225..0aff956f 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.10
+ARG NEXTCLOUD_VERSION=20.0.11
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index 7582a4ec..9f46725a 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.2
+ARG NEXTCLOUD_VERSION=21.0.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From ab15e38d802bb5ed4d065d299e083d2d31a65bfa Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 1 Jul 2021 14:05:42 +0200
Subject: [PATCH 314/328] Update PHP to 7.3.29

---
 nginx-php/Dockerfile.7.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 4dfc87c7..9a5beef9 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.3.28
+ARG PHP_VER=7.3.29
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From fd6a64ce32c91af10f0af142b99d2f3cf47de064 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 1 Jul 2021 18:30:10 +0200
Subject: [PATCH 315/328] Update PHP to 7.4.21

---
 nginx-php/Dockerfile.7.4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index c78b74f6..fc0b194e 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.4.20
+ARG PHP_VER=7.4.21
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 36ff6a1a86fb5eed01c170e79d45f85e5937398c Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 6 Jul 2021 13:29:55 +0200
Subject: [PATCH 316/328] Add Nextcloud 22.0

---
 nextcloud/Dockerfile.22.0 | 83 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 nextcloud/Dockerfile.22.0

diff --git a/nextcloud/Dockerfile.22.0 b/nextcloud/Dockerfile.22.0
new file mode 100644
index 00000000..131eb327
--- /dev/null
+++ b/nextcloud/Dockerfile.22.0
@@ -0,0 +1,83 @@
+FROM hoellen/nginx-php:7.4
+
+ARG NEXTCLOUD_VERSION=22.0.0
+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=5m \
+    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 \
+    imagemagick-dev \
+ && apk add \
+    libressl \
+    ca-certificates \
+    libsmbclient \
+    imagemagick \
+		libgomp \
+    ffmpeg \
+    tzdata \
+ && pecl channel-update pecl.php.net \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
+    imagick \
+ && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
+ && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.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"]

From 9a364c5be7d72d3fb1f3656d8c1111b37f866973 Mon Sep 17 00:00:00 2001
From: waja <waja@users.noreply.github.com>
Date: Tue, 6 Jul 2021 15:29:18 +0200
Subject: [PATCH 317/328] Adjusting doc for Nextcloud 22 (#53)

* Fixing version
* Nextcloud 22 is released and Nextcloud 19 is EOL
---
 nextcloud/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index d5f476e6..faf5e9c9 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -22,9 +22,10 @@
 
 ### Tags
 - **latest** : latest stable version (21.0)
-- **21.0** : latest 20.0.x version (stable)
-- **20.0** : latest 20.0.x version (old stable)
-- **19.0** : latest 19.0.x version (deprecated)
+- **22.0** : latest 22.0.x version (stable)
+- **21.0** : latest 21.0.x version (old stable)
+- **20.0** : latest 20.0.x version (deprecated)
+- ~~**19.0** : latest 19.0.x version (end-of-life)~~
 - ~~**18.0** : latest 18.0.x version (end-of-life)~~
 - ~~**17.0** : latest 17.0.x version (end-of-life)~~
 - ~~**16.0** : latest 16.0.x version (end-of-life)~~

From 7a9b05d3eef9f59272cb3f99ee4df5766b92c488 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 9 Jul 2021 11:55:39 +0200
Subject: [PATCH 318/328] nextcloud:latest is now v22.0

---
 nextcloud/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index faf5e9c9..38660cdb 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,7 +21,7 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (21.0)
+- **latest** : latest stable version (22.0)
 - **22.0** : latest 22.0.x version (stable)
 - **21.0** : latest 21.0.x version (old stable)
 - **20.0** : latest 20.0.x version (deprecated)

From 26ae6dccf0eb16f8468795e6c3e63fa68d970dd4 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 29 Jul 2021 19:37:30 +0200
Subject: [PATCH 319/328] Update PHP to 7.4.22

---
 nginx-php/Dockerfile.7.4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index fc0b194e..91379008 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -3,7 +3,7 @@ FROM alpine:3.13
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.4.21
+ARG PHP_VER=7.4.22
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 98b607b0583ede1cc009067e8688ac765e1b4930 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 3 Aug 2021 23:26:21 +0200
Subject: [PATCH 320/328] Remove Nextcloud 19.0

---
 nextcloud/Dockerfile.19.0 | 82 ---------------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 nextcloud/Dockerfile.19.0

diff --git a/nextcloud/Dockerfile.19.0 b/nextcloud/Dockerfile.19.0
deleted file mode 100644
index a8f7e3c0..00000000
--- a/nextcloud/Dockerfile.19.0
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=19.0.13
-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=5m \
-    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 \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick \
-    ffmpeg \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.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"]

From f3893b91a7a930e6bc3547ea5a1b83e837ee3eca Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Tue, 3 Aug 2021 23:42:55 +0200
Subject: [PATCH 321/328] Update Nextcloud to 22.1.0, 21.0.4 and 20.0.12

---
 nextcloud/Dockerfile.20.0 | 2 +-
 nextcloud/Dockerfile.21.0 | 2 +-
 nextcloud/Dockerfile.22.0 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 0aff956f..01e0ce65 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.11
+ARG NEXTCLOUD_VERSION=20.0.12
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index 9f46725a..8b71d646 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.3
+ARG NEXTCLOUD_VERSION=21.0.4
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.22.0 b/nextcloud/Dockerfile.22.0
index 131eb327..9f98562b 100644
--- a/nextcloud/Dockerfile.22.0
+++ b/nextcloud/Dockerfile.22.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=22.0.0
+ARG NEXTCLOUD_VERSION=22.1.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From dcda13e79781cba4441aefa937f66342851e28eb Mon Sep 17 00:00:00 2001
From: Joseph Weigl <2631895+eloo@users.noreply.github.com>
Date: Tue, 31 Aug 2021 21:01:16 +0200
Subject: [PATCH 322/328] Update nextcloud to 22.1.1

---
 nextcloud/Dockerfile.22.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile.22.0 b/nextcloud/Dockerfile.22.0
index 9f98562b..54747dae 100644
--- a/nextcloud/Dockerfile.22.0
+++ b/nextcloud/Dockerfile.22.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=22.1.0
+ARG NEXTCLOUD_VERSION=22.1.1
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From c6f1edcc8b11807746f7c9956e62927426a3b501 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 5 Aug 2021 17:47:05 +0200
Subject: [PATCH 323/328] Rename Version (Nextcloud 22.0 -> 22.1)

---
 nextcloud/{Dockerfile.22.0 => Dockerfile.22.1} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename nextcloud/{Dockerfile.22.0 => Dockerfile.22.1} (100%)

diff --git a/nextcloud/Dockerfile.22.0 b/nextcloud/Dockerfile.22.1
similarity index 100%
rename from nextcloud/Dockerfile.22.0
rename to nextcloud/Dockerfile.22.1

From b7b5e545a02d47fd1b43e9cea2be1fe837e66a27 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 17 Sep 2021 16:13:11 +0200
Subject: [PATCH 324/328] Update README

---
 nextcloud/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 38660cdb..63453cdc 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,8 +21,8 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (22.0)
-- **22.0** : latest 22.0.x version (stable)
+- **latest** : latest stable version (22.1)
+- **22.1** : latest 22.1.x version (stable)
 - **21.0** : latest 21.0.x version (old stable)
 - **20.0** : latest 20.0.x version (deprecated)
 - ~~**19.0** : latest 19.0.x version (end-of-life)~~

From 6e2ebaa7e4d49f2cc14e65fb9cec034317b82950 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 30 Sep 2021 21:03:44 +0200
Subject: [PATCH 325/328] Update Nextcloud to 22.2.0, 21.0.5 and 20.0.13

---
 nextcloud/Dockerfile.20.0                      | 2 +-
 nextcloud/Dockerfile.21.0                      | 2 +-
 nextcloud/{Dockerfile.22.1 => Dockerfile.22.2} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename nextcloud/{Dockerfile.22.1 => Dockerfile.22.2} (98%)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 01e0ce65..7a3bbed1 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.12
+ARG NEXTCLOUD_VERSION=20.0.13
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index 8b71d646..fda66cad 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.4
+ARG NEXTCLOUD_VERSION=21.0.5
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.22.1 b/nextcloud/Dockerfile.22.2
similarity index 98%
rename from nextcloud/Dockerfile.22.1
rename to nextcloud/Dockerfile.22.2
index 54747dae..426f8f29 100644
--- a/nextcloud/Dockerfile.22.1
+++ b/nextcloud/Dockerfile.22.2
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=22.1.1
+ARG NEXTCLOUD_VERSION=22.2.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 852d65df367855ac8ae4c533fc0478dbdb3c296b Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 13 Nov 2021 12:07:05 +0100
Subject: [PATCH 326/328] Update Nextcloud to 22.2.2, 21.0.6 and 20.0.14

---
 nextcloud/Dockerfile.20.0 | 2 +-
 nextcloud/Dockerfile.21.0 | 2 +-
 nextcloud/Dockerfile.22.2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/Dockerfile.20.0 b/nextcloud/Dockerfile.20.0
index 7a3bbed1..a907b348 100644
--- a/nextcloud/Dockerfile.20.0
+++ b/nextcloud/Dockerfile.20.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=20.0.13
+ARG NEXTCLOUD_VERSION=20.0.14
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index fda66cad..1e7f18f9 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.5
+ARG NEXTCLOUD_VERSION=21.0.6
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.22.2 b/nextcloud/Dockerfile.22.2
index 426f8f29..43c7b087 100644
--- a/nextcloud/Dockerfile.22.2
+++ b/nextcloud/Dockerfile.22.2
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=22.2.0
+ARG NEXTCLOUD_VERSION=22.2.2
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \

From 328ac765e94c382437ee131b7aaa0fcfca981902 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Sat, 13 Nov 2021 12:11:54 +0100
Subject: [PATCH 327/328] Update PHP to 7.4.25 and 7.3.32

---
 nginx-php/Dockerfile.7.3 | 4 ++--
 nginx-php/Dockerfile.7.4 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nginx-php/Dockerfile.7.3 b/nginx-php/Dockerfile.7.3
index 9a5beef9..2e922758 100644
--- a/nginx-php/Dockerfile.7.3
+++ b/nginx-php/Dockerfile.7.3
@@ -1,9 +1,9 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.3.29
+ARG PHP_VER=7.3.32
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \
diff --git a/nginx-php/Dockerfile.7.4 b/nginx-php/Dockerfile.7.4
index 91379008..77870e66 100644
--- a/nginx-php/Dockerfile.7.4
+++ b/nginx-php/Dockerfile.7.4
@@ -1,9 +1,9 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.20.1
-ARG PHP_VER=7.4.22
+ARG PHP_VER=7.4.25
 ARG LIBICONV_VERSION=1.16
 
 LABEL description="nginx + php image based on Alpine" \

From 557785c159f7c0d8f0a20f5f729dad665f6061cc Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Tue, 16 Nov 2021 21:24:47 +0100
Subject: [PATCH 328/328] Updateing Nextcloud to 22.2.3 and 21.0.7

---
 nextcloud/Dockerfile.21.0 | 2 +-
 nextcloud/Dockerfile.22.2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index 1e7f18f9..3a871a3c 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.6
+ARG NEXTCLOUD_VERSION=21.0.7
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
diff --git a/nextcloud/Dockerfile.22.2 b/nextcloud/Dockerfile.22.2
index 43c7b087..498a8e12 100644
--- a/nextcloud/Dockerfile.22.2
+++ b/nextcloud/Dockerfile.22.2
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=22.2.2
+ARG NEXTCLOUD_VERSION=22.2.3
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \