diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-04-19 19:29:51 +0200 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2017-04-19 19:29:51 +0200 |
| commit | d253cc11713122ca49e8bb1857ac9e6772440d20 (patch) | |
| tree | aab423ecf2e8f1570fba650c52610cfda7834db8 /10.0/apache | |
| parent | 201d934bb613d202ed3a6e50e90ecf11c0cd5afc (diff) | |
strong permissions
Diffstat (limited to '10.0/apache')
| -rw-r--r-- | 10.0/apache/Dockerfile | 13 | ||||
| -rwxr-xr-x | 10.0/apache/docker-entrypoint.sh | 9 |
2 files changed, 19 insertions, 3 deletions
diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 51f65a0d..95ac1e47 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -54,7 +54,18 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \ && tar -xjf nextcloud.tar.bz2 -C /usr/src/ \ && rm nextcloud.tar.bz2 \ - && rm -rf /usr/src/nextcloud/updater + && rm -rf /usr/src/nextcloud/updater \ + # https://docs.nextcloud.com/server/11/admin_manual/installation/installation_wizard.html#setting-strong-directory-permissions + && mkdir -p /usr/src/nextcloud/data \ + && mkdir -p /usr/src/nextcloud/custom_apps \ + && find /usr/src/nextcloud/ -type f -print0 | xargs -0 chmod 0640 \ + && find /usr/src/nextcloud/ -type d -print0 | xargs -0 chmod 0750 \ + && chown -R root:www-data /usr/src/nextcloud/ \ + && chown -R www-data:www-data /usr/src/nextcloud/custom_apps/ \ + && chown -R www-data:www-data /usr/src/nextcloud/config/ \ + && chown -R www-data:www-data /usr/src/nextcloud/data/ \ + && chown -R www-data:www-data /usr/src/nextcloud/themes/ \ + && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh COPY apps.config.php /usr/src/nextcloud/config/apps.config.php diff --git a/10.0/apache/docker-entrypoint.sh b/10.0/apache/docker-entrypoint.sh index 7c171148..b2bf65e7 100755 --- a/10.0/apache/docker-entrypoint.sh +++ b/10.0/apache/docker-entrypoint.sh @@ -28,9 +28,14 @@ if version_greater "$image_version" "$installed_version"; then cp -arT /usr/src/nextcloud/config /var/www/html/config fi - mkdir -p /var/www/html/custom_apps + if [ ! -d /var/www/html/data ]; then + cp -arT /usr/src/nextcloud/data /var/www/html/data + fi - chown -R www-data /var/www/html + if [ ! -d /var/www/html/custom_apps ]; then + cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps + 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 su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' |