diff --git a/Dockerfile-php7.template b/Dockerfile-php7.template index a57429e7..9fb0e576 100644 --- a/Dockerfile-php7.template +++ b/Dockerfile-php7.template @@ -59,15 +59,11 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ # 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 \ - # only used in nextcloud 9 (assets) - && mkdir -p /usr/src/nextcloud/assets \ && 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/ \ - # only used in nextcloud 9 (assets) - && chown -R www-data:www-data /usr/src/nextcloud/assets/ \ && 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 diff --git a/Dockerfile.template b/Dockerfile.template index 24ef5e9c..14cf3626 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -58,15 +58,11 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ # 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 \ - # only used in nextcloud 9 (assets) - && mkdir -p /usr/src/nextcloud/assets \ && 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/ \ - # only used in nextcloud 9 (assets) - && chown -R www-data:www-data /usr/src/nextcloud/assets/ \ && 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 diff --git a/update.sh b/update.sh index ddbb1d0d..bc9dadc1 100755 --- a/update.sh +++ b/update.sh @@ -49,11 +49,6 @@ for latest in "${latests[@]}"; do sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile" fi - # Remove the assets folder if version >= 10.0 - if version_greater_or_equal "$version" "10.0"; then - sed -ri -e '/assets/d' "$version/$variant/Dockerfile" - fi - # Copy the docker-entrypoint. cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"