diff options
author | Tilo Spannagel <development@tilosp.de> | 2017-06-03 14:13:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-03 14:13:22 +0200 |
commit | 31c6487e4f04c15a2ebf121fb6b52249d2129ba8 (patch) | |
tree | 183b3c3468f5050805c884cd7d0f03dbf31c37ad | |
parent | 29cfadb7789313f4c70f3bba2cb7b17f8e5f8432 (diff) | |
parent | 749f25b93dc4644898b10f2f9524330051c42fe5 (diff) |
Merge pull request #79 from tilosp-docker/exclude-themes
Don't overwrite themes
-rwxr-xr-x | 10.0/apache/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | 10.0/fpm/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | 11.0/apache/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | 11.0/fpm/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | 9.0/apache/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | 9.0/fpm/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | docker-entrypoint.sh | 6 |
7 files changed, 35 insertions, 7 deletions
diff --git a/10.0/apache/docker-entrypoint.sh b/10.0/apache/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/10.0/apache/docker-entrypoint.sh +++ b/10.0/apache/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/10.0/fpm/docker-entrypoint.sh b/10.0/fpm/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/10.0/fpm/docker-entrypoint.sh +++ b/10.0/fpm/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/11.0/apache/docker-entrypoint.sh b/11.0/apache/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/11.0/apache/docker-entrypoint.sh +++ b/11.0/apache/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/11.0/fpm/docker-entrypoint.sh b/11.0/fpm/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/11.0/fpm/docker-entrypoint.sh +++ b/11.0/fpm/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/9.0/apache/docker-entrypoint.sh b/9.0/apache/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/9.0/apache/docker-entrypoint.sh +++ b/9.0/apache/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/9.0/fpm/docker-entrypoint.sh b/9.0/fpm/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/9.0/fpm/docker-entrypoint.sh +++ b/9.0/fpm/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b2bf65e7..b1265d39 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before fi - rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/ + rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ if [ ! -d /var/www/html/config ]; then cp -arT /usr/src/nextcloud/config /var/www/html/config @@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/themes ]; then + cp -arT /usr/src/nextcloud/themes /var/www/html/themes + fi + if [ "$installed_version" != "0.0.0~unknown" ]; then su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' |