diff --git a/.travis.yml b/.travis.yml index e1463a8b..8aff0ef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,13 +68,7 @@ jobs: - travis_retry ./generate-stackbrew-library.sh - stage: test images - env: VERSION=19.0-rc VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=19.0-rc VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=19.0-rc VARIANT=fpm ARCH=amd64 - - env: VERSION=19.0-rc VARIANT=fpm ARCH=i386 - - env: VERSION=19.0-rc VARIANT=apache ARCH=amd64 - - env: VERSION=19.0-rc VARIANT=apache ARCH=i386 - - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64 + 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 - env: VERSION=16.0 VARIANT=fpm ARCH=i386 @@ -92,3 +86,9 @@ jobs: - env: VERSION=18.0 VARIANT=fpm ARCH=i386 - env: VERSION=18.0 VARIANT=apache ARCH=amd64 - env: VERSION=18.0 VARIANT=apache ARCH=i386 + - env: VERSION=19.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=19.0 VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=19.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=19.0 VARIANT=fpm ARCH=i386 + - env: VERSION=19.0 VARIANT=apache ARCH=amd64 + - env: VERSION=19.0 VARIANT=apache ARCH=i386 diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile index 4f53a2b0..9d08dc1d 100644 --- a/16.0/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 16.0.10 +ENV NEXTCLOUD_VERSION 16.0.11 RUN set -ex; \ fetchDeps=" \ diff --git a/16.0/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile index d5a267d4..b66f1319 100644 --- a/16.0/fpm-alpine/Dockerfile +++ b/16.0/fpm-alpine/Dockerfile @@ -94,7 +94,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 16.0.10 +ENV NEXTCLOUD_VERSION 16.0.11 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile index d8fafe47..cacda450 100644 --- a/16.0/fpm/Dockerfile +++ b/16.0/fpm/Dockerfile @@ -107,7 +107,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 16.0.10 +ENV NEXTCLOUD_VERSION 16.0.11 RUN set -ex; \ fetchDeps=" \ diff --git a/17.0/apache/Dockerfile b/17.0/apache/Dockerfile index 14633966..9b0f9df9 100644 --- a/17.0/apache/Dockerfile +++ b/17.0/apache/Dockerfile @@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 17.0.6 +ENV NEXTCLOUD_VERSION 17.0.7 RUN set -ex; \ fetchDeps=" \ diff --git a/17.0/fpm-alpine/Dockerfile b/17.0/fpm-alpine/Dockerfile index 15277332..4322b08d 100644 --- a/17.0/fpm-alpine/Dockerfile +++ b/17.0/fpm-alpine/Dockerfile @@ -94,7 +94,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 17.0.6 +ENV NEXTCLOUD_VERSION 17.0.7 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/17.0/fpm/Dockerfile b/17.0/fpm/Dockerfile index 9bbc7e7d..1a4c8e20 100644 --- a/17.0/fpm/Dockerfile +++ b/17.0/fpm/Dockerfile @@ -107,7 +107,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 17.0.6 +ENV NEXTCLOUD_VERSION 17.0.7 RUN set -ex; \ fetchDeps=" \ diff --git a/18.0/apache/Dockerfile b/18.0/apache/Dockerfile index 23aba862..7ee8c5fc 100644 --- a/18.0/apache/Dockerfile +++ b/18.0/apache/Dockerfile @@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 18.0.4 +ENV NEXTCLOUD_VERSION 18.0.5 RUN set -ex; \ fetchDeps=" \ diff --git a/18.0/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile index 705e9380..1d5e067c 100644 --- a/18.0/fpm-alpine/Dockerfile +++ b/18.0/fpm-alpine/Dockerfile @@ -94,7 +94,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.4 +ENV NEXTCLOUD_VERSION 18.0.5 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/18.0/fpm/Dockerfile b/18.0/fpm/Dockerfile index e5e6cd0e..8159c95d 100644 --- a/18.0/fpm/Dockerfile +++ b/18.0/fpm/Dockerfile @@ -107,7 +107,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.4 +ENV NEXTCLOUD_VERSION 18.0.5 RUN set -ex; \ fetchDeps=" \ diff --git a/19.0-rc/apache/Dockerfile b/19.0/apache/Dockerfile similarity index 94% rename from 19.0-rc/apache/Dockerfile rename to 19.0/apache/Dockerfile index 24db04a0..230b2a31 100644 --- a/19.0-rc/apache/Dockerfile +++ b/19.0/apache/Dockerfile @@ -44,6 +44,7 @@ RUN set -ex; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ + bcmath \ exif \ gd \ intl \ @@ -113,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 19.0.0RC3 +ENV NEXTCLOUD_VERSION 19.0.0 RUN set -ex; \ fetchDeps=" \ @@ -124,9 +125,9 @@ RUN set -ex; \ 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"; \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ curl -fsSL -o nextcloud.tar.bz2.asc \ - "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ + "https://download.nextcloud.com/server/releases/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; \ diff --git a/19.0-rc/apache/config/apache-pretty-urls.config.php b/19.0/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 19.0-rc/apache/config/apache-pretty-urls.config.php rename to 19.0/apache/config/apache-pretty-urls.config.php diff --git a/19.0-rc/apache/config/apcu.config.php b/19.0/apache/config/apcu.config.php similarity index 100% rename from 19.0-rc/apache/config/apcu.config.php rename to 19.0/apache/config/apcu.config.php diff --git a/19.0-rc/apache/config/apps.config.php b/19.0/apache/config/apps.config.php similarity index 100% rename from 19.0-rc/apache/config/apps.config.php rename to 19.0/apache/config/apps.config.php diff --git a/19.0-rc/apache/config/autoconfig.php b/19.0/apache/config/autoconfig.php similarity index 100% rename from 19.0-rc/apache/config/autoconfig.php rename to 19.0/apache/config/autoconfig.php diff --git a/19.0-rc/apache/config/redis.config.php b/19.0/apache/config/redis.config.php similarity index 100% rename from 19.0-rc/apache/config/redis.config.php rename to 19.0/apache/config/redis.config.php diff --git a/19.0-rc/apache/config/reverse-proxy.config.php b/19.0/apache/config/reverse-proxy.config.php similarity index 100% rename from 19.0-rc/apache/config/reverse-proxy.config.php rename to 19.0/apache/config/reverse-proxy.config.php diff --git a/19.0-rc/apache/config/smtp.config.php b/19.0/apache/config/smtp.config.php similarity index 100% rename from 19.0-rc/apache/config/smtp.config.php rename to 19.0/apache/config/smtp.config.php diff --git a/19.0-rc/apache/cron.sh b/19.0/apache/cron.sh similarity index 100% rename from 19.0-rc/apache/cron.sh rename to 19.0/apache/cron.sh diff --git a/19.0-rc/apache/entrypoint.sh b/19.0/apache/entrypoint.sh similarity index 100% rename from 19.0-rc/apache/entrypoint.sh rename to 19.0/apache/entrypoint.sh diff --git a/19.0-rc/apache/upgrade.exclude b/19.0/apache/upgrade.exclude similarity index 100% rename from 19.0-rc/apache/upgrade.exclude rename to 19.0/apache/upgrade.exclude diff --git a/19.0-rc/fpm-alpine/Dockerfile b/19.0/fpm-alpine/Dockerfile similarity index 93% rename from 19.0-rc/fpm-alpine/Dockerfile rename to 19.0/fpm-alpine/Dockerfile index d85293ba..dba6f693 100644 --- a/19.0-rc/fpm-alpine/Dockerfile +++ b/19.0/fpm-alpine/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ + bcmath \ exif \ gd \ intl \ @@ -94,7 +95,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 19.0.0RC3 +ENV NEXTCLOUD_VERSION 19.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -103,9 +104,9 @@ RUN set -ex; \ ; \ \ curl -fsSL -o nextcloud.tar.bz2 \ - "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ curl -fsSL -o nextcloud.tar.bz2.asc \ - "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ + "https://download.nextcloud.com/server/releases/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; \ diff --git a/19.0-rc/fpm-alpine/config/apcu.config.php b/19.0/fpm-alpine/config/apcu.config.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/apcu.config.php rename to 19.0/fpm-alpine/config/apcu.config.php diff --git a/19.0-rc/fpm-alpine/config/apps.config.php b/19.0/fpm-alpine/config/apps.config.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/apps.config.php rename to 19.0/fpm-alpine/config/apps.config.php diff --git a/19.0-rc/fpm-alpine/config/autoconfig.php b/19.0/fpm-alpine/config/autoconfig.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/autoconfig.php rename to 19.0/fpm-alpine/config/autoconfig.php diff --git a/19.0-rc/fpm-alpine/config/redis.config.php b/19.0/fpm-alpine/config/redis.config.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/redis.config.php rename to 19.0/fpm-alpine/config/redis.config.php diff --git a/19.0-rc/fpm-alpine/config/reverse-proxy.config.php b/19.0/fpm-alpine/config/reverse-proxy.config.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/reverse-proxy.config.php rename to 19.0/fpm-alpine/config/reverse-proxy.config.php diff --git a/19.0-rc/fpm-alpine/config/smtp.config.php b/19.0/fpm-alpine/config/smtp.config.php similarity index 100% rename from 19.0-rc/fpm-alpine/config/smtp.config.php rename to 19.0/fpm-alpine/config/smtp.config.php diff --git a/19.0-rc/fpm-alpine/cron.sh b/19.0/fpm-alpine/cron.sh similarity index 100% rename from 19.0-rc/fpm-alpine/cron.sh rename to 19.0/fpm-alpine/cron.sh diff --git a/19.0-rc/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh similarity index 100% rename from 19.0-rc/fpm-alpine/entrypoint.sh rename to 19.0/fpm-alpine/entrypoint.sh diff --git a/19.0-rc/fpm-alpine/upgrade.exclude b/19.0/fpm-alpine/upgrade.exclude similarity index 100% rename from 19.0-rc/fpm-alpine/upgrade.exclude rename to 19.0/fpm-alpine/upgrade.exclude diff --git a/19.0-rc/fpm/Dockerfile b/19.0/fpm/Dockerfile similarity index 94% rename from 19.0-rc/fpm/Dockerfile rename to 19.0/fpm/Dockerfile index f5c40e62..53a3c519 100644 --- a/19.0-rc/fpm/Dockerfile +++ b/19.0/fpm/Dockerfile @@ -44,6 +44,7 @@ RUN set -ex; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ + bcmath \ exif \ gd \ intl \ @@ -105,7 +106,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 19.0.0RC3 +ENV NEXTCLOUD_VERSION 19.0.0 RUN set -ex; \ fetchDeps=" \ @@ -116,9 +117,9 @@ RUN set -ex; \ 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"; \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ curl -fsSL -o nextcloud.tar.bz2.asc \ - "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ + "https://download.nextcloud.com/server/releases/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; \ diff --git a/19.0-rc/fpm/config/apcu.config.php b/19.0/fpm/config/apcu.config.php similarity index 100% rename from 19.0-rc/fpm/config/apcu.config.php rename to 19.0/fpm/config/apcu.config.php diff --git a/19.0-rc/fpm/config/apps.config.php b/19.0/fpm/config/apps.config.php similarity index 100% rename from 19.0-rc/fpm/config/apps.config.php rename to 19.0/fpm/config/apps.config.php diff --git a/19.0-rc/fpm/config/autoconfig.php b/19.0/fpm/config/autoconfig.php similarity index 100% rename from 19.0-rc/fpm/config/autoconfig.php rename to 19.0/fpm/config/autoconfig.php diff --git a/19.0-rc/fpm/config/redis.config.php b/19.0/fpm/config/redis.config.php similarity index 100% rename from 19.0-rc/fpm/config/redis.config.php rename to 19.0/fpm/config/redis.config.php diff --git a/19.0-rc/fpm/config/reverse-proxy.config.php b/19.0/fpm/config/reverse-proxy.config.php similarity index 100% rename from 19.0-rc/fpm/config/reverse-proxy.config.php rename to 19.0/fpm/config/reverse-proxy.config.php diff --git a/19.0-rc/fpm/config/smtp.config.php b/19.0/fpm/config/smtp.config.php similarity index 100% rename from 19.0-rc/fpm/config/smtp.config.php rename to 19.0/fpm/config/smtp.config.php diff --git a/19.0-rc/fpm/cron.sh b/19.0/fpm/cron.sh similarity index 100% rename from 19.0-rc/fpm/cron.sh rename to 19.0/fpm/cron.sh diff --git a/19.0-rc/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh similarity index 100% rename from 19.0-rc/fpm/entrypoint.sh rename to 19.0/fpm/entrypoint.sh diff --git a/19.0-rc/fpm/upgrade.exclude b/19.0/fpm/upgrade.exclude similarity index 100% rename from 19.0-rc/fpm/upgrade.exclude rename to 19.0/fpm/upgrade.exclude diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6cf338a6..7511056c 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -37,6 +37,7 @@ RUN set -ex; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ + bcmath \ exif \ gd \ intl \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 361a5eb1..8026cf12 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -45,6 +45,7 @@ RUN set -ex; \ 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)" \ + bcmath \ exif \ gd \ intl \ diff --git a/latest.txt b/latest.txt index ae357e4b..49e3587f 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -18.0.4 +19.0.0 diff --git a/update.sh b/update.sh index 8cb55e85..918ac8b4 100755 --- a/update.sh +++ b/update.sh @@ -147,6 +147,15 @@ function create_variant() { ;; esac + case "$version" in + 16.*|17.*|18.* ) + sed -ri -e ' + \@bcmath@d; + ' "$dir/Dockerfile" + ;; + + esac + # Copy the shell scripts for name in entrypoint cron; do cp "docker-$name.sh" "$dir/$name.sh"