diff --git a/20/apache/Dockerfile b/23/apache/Dockerfile similarity index 98% rename from 20/apache/Dockerfile rename to 23/apache/Dockerfile index 04367919..b9d80301 100644 --- a/20/apache/Dockerfile +++ b/23/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-apache-bullseye +FROM php:8.0-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 20.0.14 +ENV NEXTCLOUD_VERSION 23.0.0 RUN set -ex; \ fetchDeps=" \ diff --git a/20/apache/config/apache-pretty-urls.config.php b/23/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 20/apache/config/apache-pretty-urls.config.php rename to 23/apache/config/apache-pretty-urls.config.php diff --git a/20/apache/config/apcu.config.php b/23/apache/config/apcu.config.php similarity index 100% rename from 20/apache/config/apcu.config.php rename to 23/apache/config/apcu.config.php diff --git a/20/apache/config/apps.config.php b/23/apache/config/apps.config.php similarity index 100% rename from 20/apache/config/apps.config.php rename to 23/apache/config/apps.config.php diff --git a/20/apache/config/autoconfig.php b/23/apache/config/autoconfig.php similarity index 100% rename from 20/apache/config/autoconfig.php rename to 23/apache/config/autoconfig.php diff --git a/20/apache/config/redis.config.php b/23/apache/config/redis.config.php similarity index 100% rename from 20/apache/config/redis.config.php rename to 23/apache/config/redis.config.php diff --git a/20/apache/config/reverse-proxy.config.php b/23/apache/config/reverse-proxy.config.php similarity index 100% rename from 20/apache/config/reverse-proxy.config.php rename to 23/apache/config/reverse-proxy.config.php diff --git a/20/apache/config/s3.config.php b/23/apache/config/s3.config.php similarity index 100% rename from 20/apache/config/s3.config.php rename to 23/apache/config/s3.config.php diff --git a/20/apache/config/smtp.config.php b/23/apache/config/smtp.config.php similarity index 100% rename from 20/apache/config/smtp.config.php rename to 23/apache/config/smtp.config.php diff --git a/20/apache/config/swift.config.php b/23/apache/config/swift.config.php similarity index 100% rename from 20/apache/config/swift.config.php rename to 23/apache/config/swift.config.php diff --git a/20/apache/cron.sh b/23/apache/cron.sh similarity index 100% rename from 20/apache/cron.sh rename to 23/apache/cron.sh diff --git a/20/apache/entrypoint.sh b/23/apache/entrypoint.sh similarity index 100% rename from 20/apache/entrypoint.sh rename to 23/apache/entrypoint.sh diff --git a/20/apache/upgrade.exclude b/23/apache/upgrade.exclude similarity index 100% rename from 20/apache/upgrade.exclude rename to 23/apache/upgrade.exclude diff --git a/20/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile similarity index 98% rename from 20/fpm-alpine/Dockerfile rename to 23/fpm-alpine/Dockerfile index 9453bca5..56d42121 100644 --- a/20/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.4-fpm-alpine3.14 +FROM php:8.0-fpm-alpine3.14 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -102,7 +102,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 20.0.14 +ENV NEXTCLOUD_VERSION 23.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/20/fpm-alpine/config/apcu.config.php b/23/fpm-alpine/config/apcu.config.php similarity index 100% rename from 20/fpm-alpine/config/apcu.config.php rename to 23/fpm-alpine/config/apcu.config.php diff --git a/20/fpm-alpine/config/apps.config.php b/23/fpm-alpine/config/apps.config.php similarity index 100% rename from 20/fpm-alpine/config/apps.config.php rename to 23/fpm-alpine/config/apps.config.php diff --git a/20/fpm-alpine/config/autoconfig.php b/23/fpm-alpine/config/autoconfig.php similarity index 100% rename from 20/fpm-alpine/config/autoconfig.php rename to 23/fpm-alpine/config/autoconfig.php diff --git a/20/fpm-alpine/config/redis.config.php b/23/fpm-alpine/config/redis.config.php similarity index 100% rename from 20/fpm-alpine/config/redis.config.php rename to 23/fpm-alpine/config/redis.config.php diff --git a/20/fpm-alpine/config/reverse-proxy.config.php b/23/fpm-alpine/config/reverse-proxy.config.php similarity index 100% rename from 20/fpm-alpine/config/reverse-proxy.config.php rename to 23/fpm-alpine/config/reverse-proxy.config.php diff --git a/20/fpm-alpine/config/s3.config.php b/23/fpm-alpine/config/s3.config.php similarity index 100% rename from 20/fpm-alpine/config/s3.config.php rename to 23/fpm-alpine/config/s3.config.php diff --git a/20/fpm-alpine/config/smtp.config.php b/23/fpm-alpine/config/smtp.config.php similarity index 100% rename from 20/fpm-alpine/config/smtp.config.php rename to 23/fpm-alpine/config/smtp.config.php diff --git a/20/fpm-alpine/config/swift.config.php b/23/fpm-alpine/config/swift.config.php similarity index 100% rename from 20/fpm-alpine/config/swift.config.php rename to 23/fpm-alpine/config/swift.config.php diff --git a/20/fpm-alpine/cron.sh b/23/fpm-alpine/cron.sh similarity index 100% rename from 20/fpm-alpine/cron.sh rename to 23/fpm-alpine/cron.sh diff --git a/20/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh similarity index 100% rename from 20/fpm-alpine/entrypoint.sh rename to 23/fpm-alpine/entrypoint.sh diff --git a/20/fpm-alpine/upgrade.exclude b/23/fpm-alpine/upgrade.exclude similarity index 100% rename from 20/fpm-alpine/upgrade.exclude rename to 23/fpm-alpine/upgrade.exclude diff --git a/20/fpm/Dockerfile b/23/fpm/Dockerfile similarity index 98% rename from 20/fpm/Dockerfile rename to 23/fpm/Dockerfile index e3255c80..1fa86f2c 100644 --- a/20/fpm/Dockerfile +++ b/23/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-fpm-bullseye +FROM php:8.0-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -114,7 +114,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 20.0.14 +ENV NEXTCLOUD_VERSION 23.0.0 RUN set -ex; \ fetchDeps=" \ diff --git a/20/fpm/config/apcu.config.php b/23/fpm/config/apcu.config.php similarity index 100% rename from 20/fpm/config/apcu.config.php rename to 23/fpm/config/apcu.config.php diff --git a/20/fpm/config/apps.config.php b/23/fpm/config/apps.config.php similarity index 100% rename from 20/fpm/config/apps.config.php rename to 23/fpm/config/apps.config.php diff --git a/20/fpm/config/autoconfig.php b/23/fpm/config/autoconfig.php similarity index 100% rename from 20/fpm/config/autoconfig.php rename to 23/fpm/config/autoconfig.php diff --git a/20/fpm/config/redis.config.php b/23/fpm/config/redis.config.php similarity index 100% rename from 20/fpm/config/redis.config.php rename to 23/fpm/config/redis.config.php diff --git a/20/fpm/config/reverse-proxy.config.php b/23/fpm/config/reverse-proxy.config.php similarity index 100% rename from 20/fpm/config/reverse-proxy.config.php rename to 23/fpm/config/reverse-proxy.config.php diff --git a/20/fpm/config/s3.config.php b/23/fpm/config/s3.config.php similarity index 100% rename from 20/fpm/config/s3.config.php rename to 23/fpm/config/s3.config.php diff --git a/20/fpm/config/smtp.config.php b/23/fpm/config/smtp.config.php similarity index 100% rename from 20/fpm/config/smtp.config.php rename to 23/fpm/config/smtp.config.php diff --git a/20/fpm/config/swift.config.php b/23/fpm/config/swift.config.php similarity index 100% rename from 20/fpm/config/swift.config.php rename to 23/fpm/config/swift.config.php diff --git a/20/fpm/cron.sh b/23/fpm/cron.sh similarity index 100% rename from 20/fpm/cron.sh rename to 23/fpm/cron.sh diff --git a/20/fpm/entrypoint.sh b/23/fpm/entrypoint.sh similarity index 100% rename from 20/fpm/entrypoint.sh rename to 23/fpm/entrypoint.sh diff --git a/20/fpm/upgrade.exclude b/23/fpm/upgrade.exclude similarity index 100% rename from 20/fpm/upgrade.exclude rename to 23/fpm/upgrade.exclude diff --git a/latest.txt b/latest.txt index 5c95d722..84b76f4d 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -22.2.3 +23.0.0 diff --git a/update.sh b/update.sh index e293a800..252aa29b 100755 --- a/update.sh +++ b/update.sh @@ -78,7 +78,7 @@ variants=( fpm-alpine ) -min_version='20' +min_version='21' # version_greater_or_equal A B returns whether A >= B function version_greater_or_equal() {