aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-25 21:00:53 +02:00
Code Activity

update directory permissions to be compatible with non-root

Browse source 
This commit updates the directory permissions to be more compatible when
running the image without root f.e. on OpenShift or when specifying it
when running with `docker run --user www-data:root ...`.
It adds detection logic to the entrypoint script as sudo is not always
allowed.

This change in directory permissions was also proposed by the official
documentation, see 22e2530.

The `chown` before the volume definition is needed to prepare the volume
as it inherits the permissions.

refs https://github.com/nextcloud/docker/issues/107
This commit is contained in:
Tobias Brunner 2017-07-17 21:35:16 +02:00 • committed by Tilo Spannagel
parent 2220249a20
commit bd3fc10d7d
No known key found for this signature in database
GPG key ID: B89F1626A58E1429
15 changed files with 135 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

22
docker-entrypoint.sh
View file

@ -11,6 +11,13 @@ function directory_empty() {
[ -n "$(find "$1"/ -prune -empty)" ]
}
function run_as() {
if [[ $EUID -eq 0 ]]; then
su - www-data -s /bin/bash -c "$1"
else
bash -c "$1"
fi
}
installed_version="0.0.0~unknown"
if [ -f /var/www/html/version.php ]; then
@ -25,10 +32,15 @@ fi
if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
run_as 'php /var/www/html/occ app:list' > /tmp/list_before
fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
if [[ $EUID -eq 0 ]]; then
rsync_options=-a
else
rsync_options=-rlD
fi
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
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
@ -44,9 +56,9 @@ if version_greater "$image_version" "$installed_version"; then
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'
run_as 'php /var/www/html/occ upgrade --no-app-disable'
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_after
run_as 'php /var/www/html/occ app:list' > /tmp/list_after
echo "The following apps have beed disabled:"
diff <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_before) <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_after) | grep '<' | cut -d- -f2 | cut -d: -f1
rm -f /tmp/list_before /tmp/list_after