adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure config/apps.config.php get copied

Browse Source 
PR #115 breaks the logic that config/apps.config.php get copied
after custom_apps: https://github.com/nextcloud/docker/pull/115#discussion_r124702790.

This patch is going to copy that file if it doesn't exist.
This commit is contained in:
Yuxiang Zhu 2017-06-29 11:23:46 +08:00
parent d1dd0fb007
commit f47f9f9c99
7 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
10.0/apache/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
10.0/fpm/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
11.0/apache/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
11.0/fpm/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
12.0/apache/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
12.0/fpm/docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

4
docker-entrypoint.sh
View File

@ -35,6 +35,10 @@ if version_greater "$image_version" "$installed_version"; then
fi fi
done done
if [ ! -f /var/www/html/config/apps.config.php ]; then
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'