Merge pull request #478 from nextcloud/exclude-file

Use exclude file for the updater

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"]

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

12.0/apache/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

12.0/fpm-alpine/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

12.0/fpm/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

13.0/apache/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

13.0/fpm-alpine/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

13.0/fpm/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

14.0/apache/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

14.0/fpm-alpine/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

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"]

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

14.0/fpm/upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/

Dockerfile-alpine.template

@@ -111,7 +111,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"]

Dockerfile-debian.template

@@ -126,7 +126,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"]

docker-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

update.sh

@@ -85,6 +85,9 @@ function create_variant() {
 		cp "docker-$name.sh" "$dir/$name.sh"
 	done
 
+	# Copy the upgrade.exclude
+	cp upgrade.exclude "$dir/"
+
 	# Copy the config directory
 	cp -rT .config "$dir/config"
 

upgrade.exclude

@@ -0,0 +1,4 @@
+/config/
+/data/
+/custom_apps/
+/themes/