From d75368bbbd7e715e910e55052efd9f94a17aad97 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Sat, 25 Aug 2018 11:18:38 +0200 Subject: [PATCH] Run update.sh Signed-off-by: Tilo Spannagel --- .travis.yml | 14 +++++++------- {14.0-beta => 14.0-rc}/apache/Dockerfile | 2 +- .../apache/config/apache-pretty-urls.config.php | 0 .../apache/config/apcu.config.php | 0 .../apache/config/apps.config.php | 0 .../apache/config/autoconfig.php | 0 {14.0-beta => 14.0-rc}/apache/cron.sh | 0 {14.0-beta => 14.0-rc}/apache/entrypoint.sh | 0 {14.0-beta => 14.0-rc}/fpm-alpine/Dockerfile | 2 +- .../fpm-alpine/config/apcu.config.php | 0 .../fpm-alpine/config/apps.config.php | 0 .../fpm-alpine/config/autoconfig.php | 0 {14.0-beta => 14.0-rc}/fpm-alpine/cron.sh | 0 {14.0-beta => 14.0-rc}/fpm-alpine/entrypoint.sh | 0 {14.0-beta => 14.0-rc}/fpm/Dockerfile | 2 +- {14.0-beta => 14.0-rc}/fpm/config/apcu.config.php | 0 {14.0-beta => 14.0-rc}/fpm/config/apps.config.php | 0 {14.0-beta => 14.0-rc}/fpm/config/autoconfig.php | 0 {14.0-beta => 14.0-rc}/fpm/cron.sh | 0 {14.0-beta => 14.0-rc}/fpm/entrypoint.sh | 0 20 files changed, 10 insertions(+), 10 deletions(-) rename {14.0-beta => 14.0-rc}/apache/Dockerfile (99%) rename {14.0-beta => 14.0-rc}/apache/config/apache-pretty-urls.config.php (100%) rename {14.0-beta => 14.0-rc}/apache/config/apcu.config.php (100%) rename {14.0-beta => 14.0-rc}/apache/config/apps.config.php (100%) rename {14.0-beta => 14.0-rc}/apache/config/autoconfig.php (100%) rename {14.0-beta => 14.0-rc}/apache/cron.sh (100%) rename {14.0-beta => 14.0-rc}/apache/entrypoint.sh (100%) rename {14.0-beta => 14.0-rc}/fpm-alpine/Dockerfile (99%) rename {14.0-beta => 14.0-rc}/fpm-alpine/config/apcu.config.php (100%) rename {14.0-beta => 14.0-rc}/fpm-alpine/config/apps.config.php (100%) rename {14.0-beta => 14.0-rc}/fpm-alpine/config/autoconfig.php (100%) rename {14.0-beta => 14.0-rc}/fpm-alpine/cron.sh (100%) rename {14.0-beta => 14.0-rc}/fpm-alpine/entrypoint.sh (100%) rename {14.0-beta => 14.0-rc}/fpm/Dockerfile (99%) rename {14.0-beta => 14.0-rc}/fpm/config/apcu.config.php (100%) rename {14.0-beta => 14.0-rc}/fpm/config/apps.config.php (100%) rename {14.0-beta => 14.0-rc}/fpm/config/autoconfig.php (100%) rename {14.0-beta => 14.0-rc}/fpm/cron.sh (100%) rename {14.0-beta => 14.0-rc}/fpm/entrypoint.sh (100%) diff --git a/.travis.yml b/.travis.yml index b3ff994b..c15ff418 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,13 +51,7 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images - env: VERSION=14.0-beta VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=14.0-beta VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=14.0-beta VARIANT=fpm ARCH=amd64 - - env: VERSION=14.0-beta VARIANT=fpm ARCH=i386 - - env: VERSION=14.0-beta VARIANT=apache ARCH=amd64 - - env: VERSION=14.0-beta VARIANT=apache ARCH=i386 - - env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=amd64 + env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0-rc VARIANT=fpm ARCH=amd64 - env: VERSION=12.0-rc VARIANT=fpm ARCH=i386 @@ -69,6 +63,12 @@ jobs: - env: VERSION=13.0-rc VARIANT=fpm ARCH=i386 - env: VERSION=13.0-rc VARIANT=apache ARCH=amd64 - env: VERSION=13.0-rc VARIANT=apache ARCH=i386 + - env: VERSION=14.0-rc VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=14.0-rc VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=14.0-rc VARIANT=fpm ARCH=amd64 + - env: VERSION=14.0-rc VARIANT=fpm ARCH=i386 + - env: VERSION=14.0-rc VARIANT=apache ARCH=amd64 + - env: VERSION=14.0-rc VARIANT=apache ARCH=i386 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0 VARIANT=fpm ARCH=amd64 diff --git a/14.0-beta/apache/Dockerfile b/14.0-rc/apache/Dockerfile similarity index 99% rename from 14.0-beta/apache/Dockerfile rename to 14.0-rc/apache/Dockerfile index dfc68350..c11cea42 100644 --- a/14.0-beta/apache/Dockerfile +++ b/14.0-rc/apache/Dockerfile @@ -104,7 +104,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 14.0.0beta4 +ENV NEXTCLOUD_VERSION 14.0.0RC1 RUN set -ex; \ fetchDeps=" \ diff --git a/14.0-beta/apache/config/apache-pretty-urls.config.php b/14.0-rc/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 14.0-beta/apache/config/apache-pretty-urls.config.php rename to 14.0-rc/apache/config/apache-pretty-urls.config.php diff --git a/14.0-beta/apache/config/apcu.config.php b/14.0-rc/apache/config/apcu.config.php similarity index 100% rename from 14.0-beta/apache/config/apcu.config.php rename to 14.0-rc/apache/config/apcu.config.php diff --git a/14.0-beta/apache/config/apps.config.php b/14.0-rc/apache/config/apps.config.php similarity index 100% rename from 14.0-beta/apache/config/apps.config.php rename to 14.0-rc/apache/config/apps.config.php diff --git a/14.0-beta/apache/config/autoconfig.php b/14.0-rc/apache/config/autoconfig.php similarity index 100% rename from 14.0-beta/apache/config/autoconfig.php rename to 14.0-rc/apache/config/autoconfig.php diff --git a/14.0-beta/apache/cron.sh b/14.0-rc/apache/cron.sh similarity index 100% rename from 14.0-beta/apache/cron.sh rename to 14.0-rc/apache/cron.sh diff --git a/14.0-beta/apache/entrypoint.sh b/14.0-rc/apache/entrypoint.sh similarity index 100% rename from 14.0-beta/apache/entrypoint.sh rename to 14.0-rc/apache/entrypoint.sh diff --git a/14.0-beta/fpm-alpine/Dockerfile b/14.0-rc/fpm-alpine/Dockerfile similarity index 99% rename from 14.0-beta/fpm-alpine/Dockerfile rename to 14.0-rc/fpm-alpine/Dockerfile index 34b9d95e..80ac903c 100644 --- a/14.0-beta/fpm-alpine/Dockerfile +++ b/14.0-rc/fpm-alpine/Dockerfile @@ -85,7 +85,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 14.0.0beta4 +ENV NEXTCLOUD_VERSION 14.0.0RC1 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/14.0-beta/fpm-alpine/config/apcu.config.php b/14.0-rc/fpm-alpine/config/apcu.config.php similarity index 100% rename from 14.0-beta/fpm-alpine/config/apcu.config.php rename to 14.0-rc/fpm-alpine/config/apcu.config.php diff --git a/14.0-beta/fpm-alpine/config/apps.config.php b/14.0-rc/fpm-alpine/config/apps.config.php similarity index 100% rename from 14.0-beta/fpm-alpine/config/apps.config.php rename to 14.0-rc/fpm-alpine/config/apps.config.php diff --git a/14.0-beta/fpm-alpine/config/autoconfig.php b/14.0-rc/fpm-alpine/config/autoconfig.php similarity index 100% rename from 14.0-beta/fpm-alpine/config/autoconfig.php rename to 14.0-rc/fpm-alpine/config/autoconfig.php diff --git a/14.0-beta/fpm-alpine/cron.sh b/14.0-rc/fpm-alpine/cron.sh similarity index 100% rename from 14.0-beta/fpm-alpine/cron.sh rename to 14.0-rc/fpm-alpine/cron.sh diff --git a/14.0-beta/fpm-alpine/entrypoint.sh b/14.0-rc/fpm-alpine/entrypoint.sh similarity index 100% rename from 14.0-beta/fpm-alpine/entrypoint.sh rename to 14.0-rc/fpm-alpine/entrypoint.sh diff --git a/14.0-beta/fpm/Dockerfile b/14.0-rc/fpm/Dockerfile similarity index 99% rename from 14.0-beta/fpm/Dockerfile rename to 14.0-rc/fpm/Dockerfile index b797223f..136cf722 100644 --- a/14.0-beta/fpm/Dockerfile +++ b/14.0-rc/fpm/Dockerfile @@ -96,7 +96,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 14.0.0beta4 +ENV NEXTCLOUD_VERSION 14.0.0RC1 RUN set -ex; \ fetchDeps=" \ diff --git a/14.0-beta/fpm/config/apcu.config.php b/14.0-rc/fpm/config/apcu.config.php similarity index 100% rename from 14.0-beta/fpm/config/apcu.config.php rename to 14.0-rc/fpm/config/apcu.config.php diff --git a/14.0-beta/fpm/config/apps.config.php b/14.0-rc/fpm/config/apps.config.php similarity index 100% rename from 14.0-beta/fpm/config/apps.config.php rename to 14.0-rc/fpm/config/apps.config.php diff --git a/14.0-beta/fpm/config/autoconfig.php b/14.0-rc/fpm/config/autoconfig.php similarity index 100% rename from 14.0-beta/fpm/config/autoconfig.php rename to 14.0-rc/fpm/config/autoconfig.php diff --git a/14.0-beta/fpm/cron.sh b/14.0-rc/fpm/cron.sh similarity index 100% rename from 14.0-beta/fpm/cron.sh rename to 14.0-rc/fpm/cron.sh diff --git a/14.0-beta/fpm/entrypoint.sh b/14.0-rc/fpm/entrypoint.sh similarity index 100% rename from 14.0-beta/fpm/entrypoint.sh rename to 14.0-rc/fpm/entrypoint.sh