Run update.sh (#1132)

* Run update.sh Signed-off-by: tilosp-bot <git-bot@tilosp.de> * Run update.sh Signed-off-by: tilosp-bot <git-bot@tilosp.de> * Run update.sh Signed-off-by: tilosp-bot <git-bot@tilosp.de> * Add bmath for 19.0 (fix ##1122 and #1137) Signed-off-by: J0WI <J0WI@users.noreply.github.com> Co-authored-by: J0WI <J0WI@users.noreply.github.com>
2020-06-04 22:50:41 +02:00 · 2020-06-04 22:50:41 +02:00 · a229b17bca
parent ba1500b05e
commit a229b17bca
45 changed files with 40 additions and 26 deletions
--- 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
--- 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=" \
--- 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 \
--- 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=" \
--- 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=" \
--- 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 \
--- 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=" \
--- 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=" \
--- 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 \
--- 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=" \
--- a/19.0-rc/apache/Dockerfile
+++ b/19.0-rc/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; \
--- a/19.0-rc/apache/config/apache-pretty-urls.config.php
+++ b/19.0-rc/apache/config/apache-pretty-urls.config.php
--- a/19.0-rc/apache/config/apcu.config.php
+++ b/19.0-rc/apache/config/apcu.config.php
--- a/19.0-rc/apache/config/apps.config.php
+++ b/19.0-rc/apache/config/apps.config.php
--- a/19.0-rc/apache/config/autoconfig.php
+++ b/19.0-rc/apache/config/autoconfig.php
--- a/19.0-rc/apache/config/redis.config.php
+++ b/19.0-rc/apache/config/redis.config.php
--- a/19.0-rc/apache/config/reverse-proxy.config.php
+++ b/19.0-rc/apache/config/reverse-proxy.config.php
--- a/19.0-rc/apache/config/smtp.config.php
+++ b/19.0-rc/apache/config/smtp.config.php
--- a/19.0-rc/apache/cron.sh
+++ b/19.0-rc/apache/cron.sh
--- a/19.0-rc/apache/entrypoint.sh
+++ b/19.0-rc/apache/entrypoint.sh
--- a/19.0-rc/apache/upgrade.exclude
+++ b/19.0-rc/apache/upgrade.exclude
--- a/19.0-rc/fpm-alpine/Dockerfile
+++ b/19.0-rc/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; \
--- a/19.0-rc/fpm-alpine/config/apcu.config.php
+++ b/19.0-rc/fpm-alpine/config/apcu.config.php
--- a/19.0-rc/fpm-alpine/config/apps.config.php
+++ b/19.0-rc/fpm-alpine/config/apps.config.php
--- a/19.0-rc/fpm-alpine/config/autoconfig.php
+++ b/19.0-rc/fpm-alpine/config/autoconfig.php
--- a/19.0-rc/fpm-alpine/config/redis.config.php
+++ b/19.0-rc/fpm-alpine/config/redis.config.php
--- a/19.0-rc/fpm-alpine/config/reverse-proxy.config.php
+++ b/19.0-rc/fpm-alpine/config/reverse-proxy.config.php
--- a/19.0-rc/fpm-alpine/config/smtp.config.php
+++ b/19.0-rc/fpm-alpine/config/smtp.config.php
--- a/19.0-rc/fpm-alpine/cron.sh
+++ b/19.0-rc/fpm-alpine/cron.sh
--- a/19.0-rc/fpm-alpine/entrypoint.sh
+++ b/19.0-rc/fpm-alpine/entrypoint.sh
--- a/19.0-rc/fpm-alpine/upgrade.exclude
+++ b/19.0-rc/fpm-alpine/upgrade.exclude
--- a/19.0-rc/fpm/Dockerfile
+++ b/19.0-rc/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; \
--- a/19.0-rc/fpm/config/apcu.config.php
+++ b/19.0-rc/fpm/config/apcu.config.php
--- a/19.0-rc/fpm/config/apps.config.php
+++ b/19.0-rc/fpm/config/apps.config.php
--- a/19.0-rc/fpm/config/autoconfig.php
+++ b/19.0-rc/fpm/config/autoconfig.php
--- a/19.0-rc/fpm/config/redis.config.php
+++ b/19.0-rc/fpm/config/redis.config.php
--- a/19.0-rc/fpm/config/reverse-proxy.config.php
+++ b/19.0-rc/fpm/config/reverse-proxy.config.php
--- a/19.0-rc/fpm/config/smtp.config.php
+++ b/19.0-rc/fpm/config/smtp.config.php
--- a/19.0-rc/fpm/cron.sh
+++ b/19.0-rc/fpm/cron.sh
--- a/19.0-rc/fpm/entrypoint.sh
+++ b/19.0-rc/fpm/entrypoint.sh
--- a/19.0-rc/fpm/upgrade.exclude
+++ b/19.0-rc/fpm/upgrade.exclude
--- 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 \
--- 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 \
--- a/latest.txt
+++ b/latest.txt
@ -1 +1 @@
-18.0.4
+19.0.0
--- 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"
 @ -1 +1 @@
 .0.4
 .0.0