diff options
author | Tilo Spannagel <development@tilosp.de> | 2018-10-01 22:32:13 +0200 |
---|---|---|
committer | Tilo Spannagel <development@tilosp.de> | 2018-10-01 22:32:13 +0200 |
commit | aec153d69af0b07bbbcb25615b035394c33f78b5 (patch) | |
tree | 5b88037b4d036988e29b82694870308fc59bcdf8 /13.0 | |
parent | a46493fbc4dfbc8e216ede5beb7b0137456f14da (diff) |
Run update.sh
Diffstat (limited to '13.0')
-rw-r--r-- | 13.0/apache/Dockerfile | 2 | ||||
-rwxr-xr-x | 13.0/apache/entrypoint.sh | 2 | ||||
-rw-r--r-- | 13.0/apache/upgrade.exclude | 4 | ||||
-rw-r--r-- | 13.0/fpm-alpine/Dockerfile | 2 | ||||
-rwxr-xr-x | 13.0/fpm-alpine/entrypoint.sh | 2 | ||||
-rw-r--r-- | 13.0/fpm-alpine/upgrade.exclude | 4 | ||||
-rw-r--r-- | 13.0/fpm/Dockerfile | 2 | ||||
-rwxr-xr-x | 13.0/fpm/entrypoint.sh | 2 | ||||
-rw-r--r-- | 13.0/fpm/upgrade.exclude | 4 |
9 files changed, 18 insertions, 6 deletions
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/ |