diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 338de7a1..7e470118 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -135,8 +135,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/12.0/apache/cron.sh b/12.0/apache/rootfs/cron.sh similarity index 100% rename from 12.0/apache/cron.sh rename to 12.0/apache/rootfs/cron.sh diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/rootfs/entrypoint.sh similarity index 100% rename from 12.0/apache/entrypoint.sh rename to 12.0/apache/rootfs/entrypoint.sh diff --git a/12.0/apache/config/apache-pretty-urls.config.php b/12.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php similarity index 100% rename from 12.0/apache/config/apache-pretty-urls.config.php rename to 12.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php diff --git a/12.0/apache/config/apcu.config.php b/12.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 12.0/apache/config/apcu.config.php rename to 12.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/12.0/apache/config/apps.config.php b/12.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 12.0/apache/config/apps.config.php rename to 12.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/12.0/apache/config/autoconfig.php b/12.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 12.0/apache/config/autoconfig.php rename to 12.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index 3d2be28c..59d1b20b 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -112,8 +112,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ apk del .fetch-deps -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/12.0/fpm-alpine/cron.sh b/12.0/fpm-alpine/rootfs/cron.sh similarity index 100% rename from 12.0/fpm-alpine/cron.sh rename to 12.0/fpm-alpine/rootfs/cron.sh diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/rootfs/entrypoint.sh similarity index 100% rename from 12.0/fpm-alpine/entrypoint.sh rename to 12.0/fpm-alpine/rootfs/entrypoint.sh diff --git a/12.0/fpm-alpine/config/apcu.config.php b/12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 12.0/fpm-alpine/config/apcu.config.php rename to 12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/12.0/fpm-alpine/config/apps.config.php b/12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 12.0/fpm-alpine/config/apps.config.php rename to 12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/12.0/fpm-alpine/config/autoconfig.php b/12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 12.0/fpm-alpine/config/autoconfig.php rename to 12.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index e53bf612..5af4eb3f 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -127,8 +127,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/12.0/fpm/cron.sh b/12.0/fpm/rootfs/cron.sh similarity index 100% rename from 12.0/fpm/cron.sh rename to 12.0/fpm/rootfs/cron.sh diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/rootfs/entrypoint.sh similarity index 100% rename from 12.0/fpm/entrypoint.sh rename to 12.0/fpm/rootfs/entrypoint.sh diff --git a/12.0/fpm/config/apcu.config.php b/12.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 12.0/fpm/config/apcu.config.php rename to 12.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/12.0/fpm/config/apps.config.php b/12.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 12.0/fpm/config/apps.config.php rename to 12.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/12.0/fpm/config/autoconfig.php b/12.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 12.0/fpm/config/autoconfig.php rename to 12.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 3ee56d07..1bf08fd5 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -135,8 +135,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/13.0/apache/cron.sh b/13.0/apache/rootfs/cron.sh similarity index 100% rename from 13.0/apache/cron.sh rename to 13.0/apache/rootfs/cron.sh diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/rootfs/entrypoint.sh similarity index 100% rename from 13.0/apache/entrypoint.sh rename to 13.0/apache/rootfs/entrypoint.sh diff --git a/13.0/apache/config/apache-pretty-urls.config.php b/13.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php similarity index 100% rename from 13.0/apache/config/apache-pretty-urls.config.php rename to 13.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php diff --git a/13.0/apache/config/apcu.config.php b/13.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 13.0/apache/config/apcu.config.php rename to 13.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/13.0/apache/config/apps.config.php b/13.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 13.0/apache/config/apps.config.php rename to 13.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/13.0/apache/config/autoconfig.php b/13.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 13.0/apache/config/autoconfig.php rename to 13.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 6ce9aa42..1f430fd4 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -112,8 +112,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ apk del .fetch-deps -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/13.0/fpm-alpine/cron.sh b/13.0/fpm-alpine/rootfs/cron.sh similarity index 100% rename from 13.0/fpm-alpine/cron.sh rename to 13.0/fpm-alpine/rootfs/cron.sh diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/rootfs/entrypoint.sh similarity index 100% rename from 13.0/fpm-alpine/entrypoint.sh rename to 13.0/fpm-alpine/rootfs/entrypoint.sh diff --git a/13.0/fpm-alpine/config/apcu.config.php b/13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 13.0/fpm-alpine/config/apcu.config.php rename to 13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/13.0/fpm-alpine/config/apps.config.php b/13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 13.0/fpm-alpine/config/apps.config.php rename to 13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/13.0/fpm-alpine/config/autoconfig.php b/13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 13.0/fpm-alpine/config/autoconfig.php rename to 13.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index a3feaf2f..695fdc60 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -127,8 +127,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/13.0/fpm/cron.sh b/13.0/fpm/rootfs/cron.sh similarity index 100% rename from 13.0/fpm/cron.sh rename to 13.0/fpm/rootfs/cron.sh diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/rootfs/entrypoint.sh similarity index 100% rename from 13.0/fpm/entrypoint.sh rename to 13.0/fpm/rootfs/entrypoint.sh diff --git a/13.0/fpm/config/apcu.config.php b/13.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 13.0/fpm/config/apcu.config.php rename to 13.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/13.0/fpm/config/apps.config.php b/13.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 13.0/fpm/config/apps.config.php rename to 13.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/13.0/fpm/config/autoconfig.php b/13.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 13.0/fpm/config/autoconfig.php rename to 13.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index e526c83b..8ba2242d 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -135,8 +135,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/14.0/apache/cron.sh b/14.0/apache/rootfs/cron.sh similarity index 100% rename from 14.0/apache/cron.sh rename to 14.0/apache/rootfs/cron.sh diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/rootfs/entrypoint.sh similarity index 100% rename from 14.0/apache/entrypoint.sh rename to 14.0/apache/rootfs/entrypoint.sh diff --git a/14.0/apache/config/apache-pretty-urls.config.php b/14.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php similarity index 100% rename from 14.0/apache/config/apache-pretty-urls.config.php rename to 14.0/apache/rootfs/usr/src/nextcloud/config/apache-pretty-urls.config.php diff --git a/14.0/apache/config/apcu.config.php b/14.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 14.0/apache/config/apcu.config.php rename to 14.0/apache/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/14.0/apache/config/apps.config.php b/14.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 14.0/apache/config/apps.config.php rename to 14.0/apache/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/14.0/apache/config/autoconfig.php b/14.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 14.0/apache/config/autoconfig.php rename to 14.0/apache/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 9eda108e..b34d39d7 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -112,8 +112,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ apk del .fetch-deps -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/14.0/fpm-alpine/cron.sh b/14.0/fpm-alpine/rootfs/cron.sh similarity index 100% rename from 14.0/fpm-alpine/cron.sh rename to 14.0/fpm-alpine/rootfs/cron.sh diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/rootfs/entrypoint.sh similarity index 100% rename from 14.0/fpm-alpine/entrypoint.sh rename to 14.0/fpm-alpine/rootfs/entrypoint.sh diff --git a/14.0/fpm-alpine/config/apcu.config.php b/14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 14.0/fpm-alpine/config/apcu.config.php rename to 14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/14.0/fpm-alpine/config/apps.config.php b/14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 14.0/fpm-alpine/config/apps.config.php rename to 14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/14.0/fpm-alpine/config/autoconfig.php b/14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 14.0/fpm-alpine/config/autoconfig.php rename to 14.0/fpm-alpine/rootfs/usr/src/nextcloud/config/autoconfig.php diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index 70496096..631249d5 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -127,8 +127,7 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* -COPY *.sh / -COPY config/* /usr/src/nextcloud/config/ +COPY rootfs / ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/14.0/fpm/cron.sh b/14.0/fpm/rootfs/cron.sh similarity index 100% rename from 14.0/fpm/cron.sh rename to 14.0/fpm/rootfs/cron.sh diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/rootfs/entrypoint.sh similarity index 100% rename from 14.0/fpm/entrypoint.sh rename to 14.0/fpm/rootfs/entrypoint.sh diff --git a/14.0/fpm/config/apcu.config.php b/14.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php similarity index 100% rename from 14.0/fpm/config/apcu.config.php rename to 14.0/fpm/rootfs/usr/src/nextcloud/config/apcu.config.php diff --git a/14.0/fpm/config/apps.config.php b/14.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php similarity index 100% rename from 14.0/fpm/config/apps.config.php rename to 14.0/fpm/rootfs/usr/src/nextcloud/config/apps.config.php diff --git a/14.0/fpm/config/autoconfig.php b/14.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php similarity index 100% rename from 14.0/fpm/config/autoconfig.php rename to 14.0/fpm/rootfs/usr/src/nextcloud/config/autoconfig.php