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

Merge pull request #110 from tilosp-docker/nextcloud-9-cleanup

Browse Source 
Nextcloud 9 cleanup
This commit is contained in:
Tilo Spannagel 2017-06-21 18:05:47 +02:00 committed by GitHub
commit 2ed2ea4a28
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile-php7.template
View File

@ -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 # 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/data \
&& mkdir -p /usr/src/nextcloud/custom_apps \ && 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 f -print0 | xargs -0 chmod 0640 \
&& find /usr/src/nextcloud/ -type d -print0 | xargs -0 chmod 0750 \ && find /usr/src/nextcloud/ -type d -print0 | xargs -0 chmod 0750 \
&& chown -R root:www-data /usr/src/nextcloud/ \ && 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/custom_apps/ \
&& chown -R www-data:www-data /usr/src/nextcloud/config/ \ && 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/data/ \
&& chown -R www-data:www-data /usr/src/nextcloud/themes/ \ && chown -R www-data:www-data /usr/src/nextcloud/themes/ \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ

4
Dockerfile.template
View File

@ -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 # 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/data \
&& mkdir -p /usr/src/nextcloud/custom_apps \ && 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 f -print0 | xargs -0 chmod 0640 \
&& find /usr/src/nextcloud/ -type d -print0 | xargs -0 chmod 0750 \ && find /usr/src/nextcloud/ -type d -print0 | xargs -0 chmod 0750 \
&& chown -R root:www-data /usr/src/nextcloud/ \ && 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/custom_apps/ \
&& chown -R www-data:www-data /usr/src/nextcloud/config/ \ && 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/data/ \
&& chown -R www-data:www-data /usr/src/nextcloud/themes/ \ && chown -R www-data:www-data /usr/src/nextcloud/themes/ \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ

5
update.sh
View File

@ -49,11 +49,6 @@ for latest in "${latests[@]}"; do
sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile" sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile"
fi 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. # Copy the docker-entrypoint.
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"