Run update.shstable-fpm-alpinestable-fpmstable-apachestableproduction-fpm-alpineproduction-fpmproduction-apacheproductionlatestfpm-alpinefpmapache19.0.0beta5-fpm-alpine19.0.0beta5-fpm19.0.0beta5-apache19.0.0beta519.0.0-beta-fpm-alpine19.0.0-beta-fpm19.0.0-beta-apache19.0.0-beta19.0-beta-fpm-alpine19.0-beta-fpm19.0-beta-apache19.0-beta19-beta-fpm-alpine19-beta-fpm19-beta-apache19-beta18.0.4-fpm-alpine18.0.4-fpm18.0.4-apache18.0.418.0-fpm-alpine18.0-fpm18.0-apache18.018-fpm-alpine18-fpm18-apache1817.0.6-fpm-alpine17.0.6-fpm17.0.6-apache17.0.617.0-fpm-alpine17.0-fpm17.0-apache17.017-fpm-alpine17-fpm17-apache1716.0.10-fpm-alpine16.0.10-fpm16.0.10-apache16.0.1016.0-fpm-alpine16.0-fpm16.0-apache16.016-fpm-alpine16-fpm16-apache16

Signed-off-by: tilosp-bot <git-bot@tilosp.de>

107 files changed, 13 insertions, 4075 deletions

diff --git a/.travis.yml b/.travis.yml
index ae1d6a0c..956eb5dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,24 +74,6 @@ jobs:
     - env: VERSION=19.0-beta VARIANT=fpm ARCH=i386
     - env: VERSION=19.0-beta VARIANT=apache ARCH=amd64
     - env: VERSION=19.0-beta VARIANT=apache ARCH=i386
-    - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=16.0-rc VARIANT=fpm ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=fpm ARCH=i386
-    - env: VERSION=16.0-rc VARIANT=apache ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=apache ARCH=i386
-    - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=17.0-rc VARIANT=fpm ARCH=amd64
-    - env: VERSION=17.0-rc VARIANT=fpm ARCH=i386
-    - env: VERSION=17.0-rc VARIANT=apache ARCH=amd64
-    - env: VERSION=17.0-rc VARIANT=apache ARCH=i386
-    - env: VERSION=18.0-rc VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=18.0-rc VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=18.0-rc VARIANT=fpm ARCH=amd64
-    - env: VERSION=18.0-rc VARIANT=fpm ARCH=i386
-    - env: VERSION=18.0-rc VARIANT=apache ARCH=amd64
-    - env: VERSION=18.0-rc VARIANT=apache ARCH=i386
     - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64
     - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=i386
     - env: VERSION=16.0 VARIANT=fpm ARCH=amd64
diff --git a/16.0-rc/apache/Dockerfile b/16.0-rc/apache/Dockerfile
deleted file mode 100644
index 07f812a9..00000000
--- a/16.0-rc/apache/Dockerfile
+++ /dev/null
@@ -1,151 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
-        busybox-static \
-    ; \
-    rm -rf /var/lib/apt/lists/*; \
-    \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
-
-# install the PHP extensions we need
-# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
-RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libcurl4-openssl-dev \
-        libevent-dev \
-        libfreetype6-dev \
-        libicu-dev \
-        libjpeg-dev \
-        libldap2-dev \
-        libmcrypt-dev \
-        libmemcached-dev \
-        libpng-dev \
-        libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
-        libwebp-dev \
-        libgmp-dev \
-    ; \
-    \
-    debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
-    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-    docker-php-ext-install -j "$(nproc)" \
-        exif \
-        gd \
-        intl \
-        ldap \
-        opcache \
-        pcntl \
-        pdo_mysql \
-        pdo_pgsql \
-        zip \
-        gmp \
-    ; \
-    \
-# pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.18; \
-    pecl install memcached-3.1.5; \
-    pecl install redis-4.3.0; \
-    pecl install imagick-3.4.4; \
-    \
-    docker-php-ext-enable \
-        apcu \
-        memcached \
-        redis \
-        imagick \
-    ; \
-    \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
-        echo 'opcache.enable=1'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=10000'; \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.save_comments=1'; \
-        echo 'opcache.revalidate_freq=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
-    \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod headers rewrite remoteip ;\
-    {\
-     echo RemoteIPHeader X-Real-IP ;\
-     echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
-     echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
-     echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
-    } > /etc/apache2/conf-available/remoteip.conf;\
-    a2enconf remoteip
-
-ENV NEXTCLOUD_VERSION 16.0.10RC2
-
-RUN set -ex; \
-    fetchDeps=" \
-        gnupg \
-        dirmngr \
-    "; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends $fetchDeps; \
-    \
-    curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
-    export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
-    mkdir -p /usr/src/nextcloud/data; \
-    mkdir -p /usr/src/nextcloud/custom_apps; \
-    chmod +x /usr/src/nextcloud/occ; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
-
-COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/16.0-rc/apache/config/apache-pretty-urls.config.php b/16.0-rc/a