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

Fix permissions when running as root

Browse Source
This commit is contained in:
Tilo Spannagel 2017-08-10 14:53:11 +02:00
parent 7366057ce1
commit 69b4a015ed
No known key found for this signature in database
GPG Key ID: B89F1626A58E1429
7 changed files with 28 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

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

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'

16
docker-entrypoint.sh
View File

@ -35,26 +35,18 @@ if version_greater "$image_version" "$installed_version"; then
run_as 'php /var/www/html/occ app:list' > /tmp/list_before run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
rsync_options=-a rsync_options="-rlDog --chown www-data:root"
else else
rsync_options=-rlD rsync_options="-rlD"
fi 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 /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
for dir in config data themes; do for dir in config data custom_apps themes; do
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi fi
done done
if [ ! -d /var/www/html/custom_apps ] && [ ! -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 [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
fi
if [ "$installed_version" != "0.0.0~unknown" ]; then if [ "$installed_version" != "0.0.0~unknown" ]; then
run_as 'php /var/www/html/occ upgrade --no-app-disable' run_as 'php /var/www/html/occ upgrade --no-app-disable'