From c8fe9f30559a9562f94bc15e2329c8532a3660b9 Mon Sep 17 00:00:00 2001 From: tilosp-bot Date: Fri, 17 Jan 2020 14:04:57 +0000 Subject: [PATCH] Run update.sh Signed-off-by: tilosp-bot --- .travis.yml | 14 +++++++------- {18.0-rc => 18.0}/apache/Dockerfile | 6 +++--- .../apache/config/apache-pretty-urls.config.php | 0 {18.0-rc => 18.0}/apache/config/apcu.config.php | 0 {18.0-rc => 18.0}/apache/config/apps.config.php | 0 {18.0-rc => 18.0}/apache/config/autoconfig.php | 0 {18.0-rc => 18.0}/apache/config/redis.config.php | 0 {18.0-rc => 18.0}/apache/config/smtp.config.php | 0 {18.0-rc => 18.0}/apache/cron.sh | 0 {18.0-rc => 18.0}/apache/entrypoint.sh | 0 {18.0-rc => 18.0}/apache/upgrade.exclude | 0 {18.0-rc => 18.0}/fpm-alpine/Dockerfile | 6 +++--- .../fpm-alpine/config/apcu.config.php | 0 .../fpm-alpine/config/apps.config.php | 0 {18.0-rc => 18.0}/fpm-alpine/config/autoconfig.php | 0 .../fpm-alpine/config/redis.config.php | 0 .../fpm-alpine/config/smtp.config.php | 0 {18.0-rc => 18.0}/fpm-alpine/cron.sh | 0 {18.0-rc => 18.0}/fpm-alpine/entrypoint.sh | 0 {18.0-rc => 18.0}/fpm-alpine/upgrade.exclude | 0 {18.0-rc => 18.0}/fpm/Dockerfile | 6 +++--- {18.0-rc => 18.0}/fpm/config/apcu.config.php | 0 {18.0-rc => 18.0}/fpm/config/apps.config.php | 0 {18.0-rc => 18.0}/fpm/config/autoconfig.php | 0 {18.0-rc => 18.0}/fpm/config/redis.config.php | 0 {18.0-rc => 18.0}/fpm/config/smtp.config.php | 0 {18.0-rc => 18.0}/fpm/cron.sh | 0 {18.0-rc => 18.0}/fpm/entrypoint.sh | 0 {18.0-rc => 18.0}/fpm/upgrade.exclude | 0 29 files changed, 16 insertions(+), 16 deletions(-) rename {18.0-rc => 18.0}/apache/Dockerfile (95%) rename {18.0-rc => 18.0}/apache/config/apache-pretty-urls.config.php (100%) rename {18.0-rc => 18.0}/apache/config/apcu.config.php (100%) rename {18.0-rc => 18.0}/apache/config/apps.config.php (100%) rename {18.0-rc => 18.0}/apache/config/autoconfig.php (100%) rename {18.0-rc => 18.0}/apache/config/redis.config.php (100%) rename {18.0-rc => 18.0}/apache/config/smtp.config.php (100%) rename {18.0-rc => 18.0}/apache/cron.sh (100%) rename {18.0-rc => 18.0}/apache/entrypoint.sh (100%) rename {18.0-rc => 18.0}/apache/upgrade.exclude (100%) rename {18.0-rc => 18.0}/fpm-alpine/Dockerfile (93%) rename {18.0-rc => 18.0}/fpm-alpine/config/apcu.config.php (100%) rename {18.0-rc => 18.0}/fpm-alpine/config/apps.config.php (100%) rename {18.0-rc => 18.0}/fpm-alpine/config/autoconfig.php (100%) rename {18.0-rc => 18.0}/fpm-alpine/config/redis.config.php (100%) rename {18.0-rc => 18.0}/fpm-alpine/config/smtp.config.php (100%) rename {18.0-rc => 18.0}/fpm-alpine/cron.sh (100%) rename {18.0-rc => 18.0}/fpm-alpine/entrypoint.sh (100%) rename {18.0-rc => 18.0}/fpm-alpine/upgrade.exclude (100%) rename {18.0-rc => 18.0}/fpm/Dockerfile (94%) rename {18.0-rc => 18.0}/fpm/config/apcu.config.php (100%) rename {18.0-rc => 18.0}/fpm/config/apps.config.php (100%) rename {18.0-rc => 18.0}/fpm/config/autoconfig.php (100%) rename {18.0-rc => 18.0}/fpm/config/redis.config.php (100%) rename {18.0-rc => 18.0}/fpm/config/smtp.config.php (100%) rename {18.0-rc => 18.0}/fpm/cron.sh (100%) rename {18.0-rc => 18.0}/fpm/entrypoint.sh (100%) rename {18.0-rc => 18.0}/fpm/upgrade.exclude (100%) diff --git a/.travis.yml b/.travis.yml index 6a17411..016b249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,13 +67,7 @@ jobs: - travis_retry ./generate-stackbrew-library.sh - stage: test images - 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=15.0 VARIANT=fpm-alpine ARCH=amd64 + env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=15.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=15.0 VARIANT=fpm ARCH=amd64 - env: VERSION=15.0 VARIANT=fpm ARCH=i386 @@ -91,3 +85,9 @@ jobs: - env: VERSION=17.0 VARIANT=fpm ARCH=i386 - env: VERSION=17.0 VARIANT=apache ARCH=amd64 - env: VERSION=17.0 VARIANT=apache ARCH=i386 + - env: VERSION=18.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=18.0 VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=18.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=18.0 VARIANT=fpm ARCH=i386 + - env: VERSION=18.0 VARIANT=apache ARCH=amd64 + - env: VERSION=18.0 VARIANT=apache ARCH=i386 diff --git a/18.0-rc/apache/Dockerfile b/18.0/apache/Dockerfile similarity index 95% rename from 18.0-rc/apache/Dockerfile rename to 18.0/apache/Dockerfile index cba8f98..9486e9c 100644 --- a/18.0-rc/apache/Dockerfile +++ b/18.0/apache/Dockerfile @@ -115,7 +115,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 18.0.0RC2 +ENV NEXTCLOUD_VERSION 18.0.0 RUN set -ex; \ fetchDeps=" \ @@ -126,9 +126,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/18.0-rc/apache/config/apache-pretty-urls.config.php b/18.0/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 18.0-rc/apache/config/apache-pretty-urls.config.php rename to 18.0/apache/config/apache-pretty-urls.config.php diff --git a/18.0-rc/apache/config/apcu.config.php b/18.0/apache/config/apcu.config.php similarity index 100% rename from 18.0-rc/apache/config/apcu.config.php rename to 18.0/apache/config/apcu.config.php diff --git a/18.0-rc/apache/config/apps.config.php b/18.0/apache/config/apps.config.php similarity index 100% rename from 18.0-rc/apache/config/apps.config.php rename to 18.0/apache/config/apps.config.php diff --git a/18.0-rc/apache/config/autoconfig.php b/18.0/apache/config/autoconfig.php similarity index 100% rename from 18.0-rc/apache/config/autoconfig.php rename to 18.0/apache/config/autoconfig.php diff --git a/18.0-rc/apache/config/redis.config.php b/18.0/apache/config/redis.config.php similarity index 100% rename from 18.0-rc/apache/config/redis.config.php rename to 18.0/apache/config/redis.config.php diff --git a/18.0-rc/apache/config/smtp.config.php b/18.0/apache/config/smtp.config.php similarity index 100% rename from 18.0-rc/apache/config/smtp.config.php rename to 18.0/apache/config/smtp.config.php diff --git a/18.0-rc/apache/cron.sh b/18.0/apache/cron.sh similarity index 100% rename from 18.0-rc/apache/cron.sh rename to 18.0/apache/cron.sh diff --git a/18.0-rc/apache/entrypoint.sh b/18.0/apache/entrypoint.sh similarity index 100% rename from 18.0-rc/apache/entrypoint.sh rename to 18.0/apache/entrypoint.sh diff --git a/18.0-rc/apache/upgrade.exclude b/18.0/apache/upgrade.exclude similarity index 100% rename from 18.0-rc/apache/upgrade.exclude rename to 18.0/apache/upgrade.exclude diff --git a/18.0-rc/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile similarity index 93% rename from 18.0-rc/fpm-alpine/Dockerfile rename to 18.0/fpm-alpine/Dockerfile index 0499410..e532ca5 100644 --- a/18.0-rc/fpm-alpine/Dockerfile +++ b/18.0/fpm-alpine/Dockerfile @@ -94,7 +94,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.0RC2 +ENV NEXTCLOUD_VERSION 18.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -103,9 +103,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/18.0-rc/fpm-alpine/config/apcu.config.php b/18.0/fpm-alpine/config/apcu.config.php similarity index 100% rename from 18.0-rc/fpm-alpine/config/apcu.config.php rename to 18.0/fpm-alpine/config/apcu.config.php diff --git a/18.0-rc/fpm-alpine/config/apps.config.php b/18.0/fpm-alpine/config/apps.config.php similarity index 100% rename from 18.0-rc/fpm-alpine/config/apps.config.php rename to 18.0/fpm-alpine/config/apps.config.php diff --git a/18.0-rc/fpm-alpine/config/autoconfig.php b/18.0/fpm-alpine/config/autoconfig.php similarity index 100% rename from 18.0-rc/fpm-alpine/config/autoconfig.php rename to 18.0/fpm-alpine/config/autoconfig.php diff --git a/18.0-rc/fpm-alpine/config/redis.config.php b/18.0/fpm-alpine/config/redis.config.php similarity index 100% rename from 18.0-rc/fpm-alpine/config/redis.config.php rename to 18.0/fpm-alpine/config/redis.config.php diff --git a/18.0-rc/fpm-alpine/config/smtp.config.php b/18.0/fpm-alpine/config/smtp.config.php similarity index 100% rename from 18.0-rc/fpm-alpine/config/smtp.config.php rename to 18.0/fpm-alpine/config/smtp.config.php diff --git a/18.0-rc/fpm-alpine/cron.sh b/18.0/fpm-alpine/cron.sh similarity index 100% rename from 18.0-rc/fpm-alpine/cron.sh rename to 18.0/fpm-alpine/cron.sh diff --git a/18.0-rc/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh similarity index 100% rename from 18.0-rc/fpm-alpine/entrypoint.sh rename to 18.0/fpm-alpine/entrypoint.sh diff --git a/18.0-rc/fpm-alpine/upgrade.exclude b/18.0/fpm-alpine/upgrade.exclude similarity index 100% rename from 18.0-rc/fpm-alpine/upgrade.exclude rename to 18.0/fpm-alpine/upgrade.exclude diff --git a/18.0-rc/fpm/Dockerfile b/18.0/fpm/Dockerfile similarity index 94% rename from 18.0-rc/fpm/Dockerfile rename to 18.0/fpm/Dockerfile index a29d602..801e308 100644 --- a/18.0-rc/fpm/Dockerfile +++ b/18.0/fpm/Dockerfile @@ -107,7 +107,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.0RC2 +ENV NEXTCLOUD_VERSION 18.0.0 RUN set -ex; \ fetchDeps=" \ @@ -118,9 +118,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/18.0-rc/fpm/config/apcu.config.php b/18.0/fpm/config/apcu.config.php similarity index 100% rename from 18.0-rc/fpm/config/apcu.config.php rename to 18.0/fpm/config/apcu.config.php diff --git a/18.0-rc/fpm/config/apps.config.php b/18.0/fpm/config/apps.config.php similarity index 100% rename from 18.0-rc/fpm/config/apps.config.php rename to 18.0/fpm/config/apps.config.php diff --git a/18.0-rc/fpm/config/autoconfig.php b/18.0/fpm/config/autoconfig.php similarity index 100% rename from 18.0-rc/fpm/config/autoconfig.php rename to 18.0/fpm/config/autoconfig.php diff --git a/18.0-rc/fpm/config/redis.config.php b/18.0/fpm/config/redis.config.php similarity index 100% rename from 18.0-rc/fpm/config/redis.config.php rename to 18.0/fpm/config/redis.config.php diff --git a/18.0-rc/fpm/config/smtp.config.php b/18.0/fpm/config/smtp.config.php similarity index 100% rename from 18.0-rc/fpm/config/smtp.config.php rename to 18.0/fpm/config/smtp.config.php diff --git a/18.0-rc/fpm/cron.sh b/18.0/fpm/cron.sh similarity index 100% rename from 18.0-rc/fpm/cron.sh rename to 18.0/fpm/cron.sh diff --git a/18.0-rc/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh similarity index 100% rename from 18.0-rc/fpm/entrypoint.sh rename to 18.0/fpm/entrypoint.sh diff --git a/18.0-rc/fpm/upgrade.exclude b/18.0/fpm/upgrade.exclude similarity index 100% rename from 18.0-rc/fpm/upgrade.exclude rename to 18.0/fpm/upgrade.exclude