Skip to content

Commit

Permalink
Don't overwrite themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@tilosp
tilosp committed May 23, 2017
1 parent 20694c4 commit 749f25b
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 7 deletions.
6 changes: 5 additions & 1 deletion 10.0/apache/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion 10.0/fpm/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion 11.0/apache/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion 11.0/fpm/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion 9.0/apache/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion 9.0/fpm/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
6 changes: 5 additions & 1 deletion docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down

0 comments on commit 749f25b

Please sign in to comment.