From aec153d69af0b07bbbcb25615b035394c33f78b5 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Mon, 1 Oct 2018 22:32:13 +0200
Subject: [PATCH] Run update.sh

---
 12.0/apache/Dockerfile          | 2 +-
 12.0/apache/entrypoint.sh       | 2 +-
 12.0/apache/upgrade.exclude     | 4 ++++
 12.0/fpm-alpine/Dockerfile      | 2 +-
 12.0/fpm-alpine/entrypoint.sh   | 2 +-
 12.0/fpm-alpine/upgrade.exclude | 4 ++++
 12.0/fpm/Dockerfile             | 2 +-
 12.0/fpm/entrypoint.sh          | 2 +-
 12.0/fpm/upgrade.exclude        | 4 ++++
 13.0/apache/Dockerfile          | 2 +-
 13.0/apache/entrypoint.sh       | 2 +-
 13.0/apache/upgrade.exclude     | 4 ++++
 13.0/fpm-alpine/Dockerfile      | 2 +-
 13.0/fpm-alpine/entrypoint.sh   | 2 +-
 13.0/fpm-alpine/upgrade.exclude | 4 ++++
 13.0/fpm/Dockerfile             | 2 +-
 13.0/fpm/entrypoint.sh          | 2 +-
 13.0/fpm/upgrade.exclude        | 4 ++++
 14.0/apache/Dockerfile          | 2 +-
 14.0/apache/entrypoint.sh       | 2 +-
 14.0/apache/upgrade.exclude     | 4 ++++
 14.0/fpm-alpine/Dockerfile      | 2 +-
 14.0/fpm-alpine/entrypoint.sh   | 2 +-
 14.0/fpm-alpine/upgrade.exclude | 4 ++++
 14.0/fpm/Dockerfile             | 2 +-
 14.0/fpm/entrypoint.sh          | 2 +-
 14.0/fpm/upgrade.exclude        | 4 ++++
 27 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 12.0/apache/upgrade.exclude
 create mode 100644 12.0/fpm-alpine/upgrade.exclude
 create mode 100644 12.0/fpm/upgrade.exclude
 create mode 100644 13.0/apache/upgrade.exclude
 create mode 100644 13.0/fpm-alpine/upgrade.exclude
 create mode 100644 13.0/fpm/upgrade.exclude
 create mode 100644 14.0/apache/upgrade.exclude
 create mode 100644 14.0/fpm-alpine/upgrade.exclude
 create mode 100644 14.0/fpm/upgrade.exclude

diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 338de7a1..d656eddb 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -135,7 +135,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/12.0/apache/entrypoint.sh
+++ b/12.0/apache/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/12.0/apache/upgrade.exclude b/12.0/apache/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/12.0/apache/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 3d2be28c..7bd6a8f2 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -112,7 +112,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     apk del .fetch-deps
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/12.0/fpm-alpine/entrypoint.sh
+++ b/12.0/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/12.0/fpm-alpine/upgrade.exclude b/12.0/fpm-alpine/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/12.0/fpm-alpine/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index e53bf612..d01584d9 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -127,7 +127,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/12.0/fpm/entrypoint.sh
+++ b/12.0/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/12.0/fpm/upgrade.exclude b/12.0/fpm/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/12.0/fpm/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 3ee56d07..f68de1cc 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -135,7 +135,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/13.0/apache/upgrade.exclude b/13.0/apache/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/13.0/apache/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 6ce9aa42..7ad23620 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -112,7 +112,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     apk del .fetch-deps
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/13.0/fpm-alpine/upgrade.exclude b/13.0/fpm-alpine/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/13.0/fpm-alpine/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index a3feaf2f..3cb5837e 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -127,7 +127,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/13.0/fpm/upgrade.exclude b/13.0/fpm/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/13.0/fpm/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index e526c83b..67af2889 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -135,7 +135,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/14.0/apache/upgrade.exclude b/14.0/apache/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/14.0/apache/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index 9eda108e..5776d3d7 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -112,7 +112,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     apk del .fetch-deps
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/14.0/fpm-alpine/upgrade.exclude b/14.0/fpm-alpine/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/14.0/fpm-alpine/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index 70496096..91088ac7 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -127,7 +127,7 @@ RUN set -ex; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
-COPY *.sh /
+COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index c31db1a1..f84eb7ee 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         else
             rsync_options="-rlD"
         fi
-        rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
+        rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
 
         for dir in config data custom_apps themes; do
             if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
diff --git a/14.0/fpm/upgrade.exclude b/14.0/fpm/upgrade.exclude
new file mode 100644
index 00000000..a1f2de95
--- /dev/null
+++ b/14.0/fpm/upgrade.exclude
@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/