From 4549fd56a942d6aa36a6cc1a9050a2143b9880c5 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 6 Sep 2018 16:58:51 +0200 Subject: [PATCH] Run update.sh Signed-off-by: Tilo Spannagel --- .travis.yml | 14 +++++++------- {14.0-rc => 14.0}/apache/Dockerfile | 6 +++--- .../apache/config/apache-pretty-urls.config.php | 0 {14.0-rc => 14.0}/apache/config/apcu.config.php | 0 {14.0-rc => 14.0}/apache/config/apps.config.php | 0 {14.0-rc => 14.0}/apache/config/autoconfig.php | 0 {14.0-rc => 14.0}/apache/cron.sh | 0 {14.0-rc => 14.0}/apache/entrypoint.sh | 0 {14.0-rc => 14.0}/fpm-alpine/Dockerfile | 6 +++--- .../fpm-alpine/config/apcu.config.php | 0 .../fpm-alpine/config/apps.config.php | 0 {14.0-rc => 14.0}/fpm-alpine/config/autoconfig.php | 0 {14.0-rc => 14.0}/fpm-alpine/cron.sh | 0 {14.0-rc => 14.0}/fpm-alpine/entrypoint.sh | 0 {14.0-rc => 14.0}/fpm/Dockerfile | 6 +++--- {14.0-rc => 14.0}/fpm/config/apcu.config.php | 0 {14.0-rc => 14.0}/fpm/config/apps.config.php | 0 {14.0-rc => 14.0}/fpm/config/autoconfig.php | 0 {14.0-rc => 14.0}/fpm/cron.sh | 0 {14.0-rc => 14.0}/fpm/entrypoint.sh | 0 20 files changed, 16 insertions(+), 16 deletions(-) rename {14.0-rc => 14.0}/apache/Dockerfile (94%) rename {14.0-rc => 14.0}/apache/config/apache-pretty-urls.config.php (100%) rename {14.0-rc => 14.0}/apache/config/apcu.config.php (100%) rename {14.0-rc => 14.0}/apache/config/apps.config.php (100%) rename {14.0-rc => 14.0}/apache/config/autoconfig.php (100%) rename {14.0-rc => 14.0}/apache/cron.sh (100%) rename {14.0-rc => 14.0}/apache/entrypoint.sh (100%) rename {14.0-rc => 14.0}/fpm-alpine/Dockerfile (93%) rename {14.0-rc => 14.0}/fpm-alpine/config/apcu.config.php (100%) rename {14.0-rc => 14.0}/fpm-alpine/config/apps.config.php (100%) rename {14.0-rc => 14.0}/fpm-alpine/config/autoconfig.php (100%) rename {14.0-rc => 14.0}/fpm-alpine/cron.sh (100%) rename {14.0-rc => 14.0}/fpm-alpine/entrypoint.sh (100%) rename {14.0-rc => 14.0}/fpm/Dockerfile (94%) rename {14.0-rc => 14.0}/fpm/config/apcu.config.php (100%) rename {14.0-rc => 14.0}/fpm/config/apps.config.php (100%) rename {14.0-rc => 14.0}/fpm/config/autoconfig.php (100%) rename {14.0-rc => 14.0}/fpm/cron.sh (100%) rename {14.0-rc => 14.0}/fpm/entrypoint.sh (100%) diff --git a/.travis.yml b/.travis.yml index e73378f..e329d6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,13 +51,7 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images - 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=amd64 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0 VARIANT=fpm ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm ARCH=i386 @@ -69,3 +63,9 @@ jobs: - env: VERSION=13.0 VARIANT=fpm ARCH=i386 - env: VERSION=13.0 VARIANT=apache ARCH=amd64 - env: VERSION=13.0 VARIANT=apache ARCH=i386 + - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=14.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=14.0 VARIANT=fpm ARCH=i386 + - env: VERSION=14.0 VARIANT=apache ARCH=amd64 + - env: VERSION=14.0 VARIANT=apache ARCH=i386 diff --git a/14.0-rc/apache/Dockerfile b/14.0/apache/Dockerfile similarity index 94% rename from 14.0-rc/apache/Dockerfile rename to 14.0/apache/Dockerfile index e5fdb5c..328af1f 100644 --- a/14.0-rc/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -104,7 +104,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 14.0.0RC2 +ENV NEXTCLOUD_VERSION 14.0.0 RUN set -ex; \ fetchDeps=" \ @@ -115,9 +115,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 --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/14.0-rc/apache/config/apache-pretty-urls.config.php b/14.0/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 14.0-rc/apache/config/apache-pretty-urls.config.php rename to 14.0/apache/config/apache-pretty-urls.config.php diff --git a/14.0-rc/apache/config/apcu.config.php b/14.0/apache/config/apcu.config.php similarity index 100% rename from 14.0-rc/apache/config/apcu.config.php rename to 14.0/apache/config/apcu.config.php diff --git a/14.0-rc/apache/config/apps.config.php b/14.0/apache/config/apps.config.php similarity index 100% rename from 14.0-rc/apache/config/apps.config.php rename to 14.0/apache/config/apps.config.php diff --git a/14.0-rc/apache/config/autoconfig.php b/14.0/apache/config/autoconfig.php similarity index 100% rename from 14.0-rc/apache/config/autoconfig.php rename to 14.0/apache/config/autoconfig.php diff --git a/14.0-rc/apache/cron.sh b/14.0/apache/cron.sh similarity index 100% rename from 14.0-rc/apache/cron.sh rename to 14.0/apache/cron.sh diff --git a/14.0-rc/apache/entrypoint.sh b/14.0/apache/entrypoint.sh similarity index 100% rename from 14.0-rc/apache/entrypoint.sh rename to 14.0/apache/entrypoint.sh diff --git a/14.0-rc/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile similarity index 93% rename from 14.0-rc/fpm-alpine/Dockerfile rename to 14.0/fpm-alpine/Dockerfile index 6f8954f..5083e07 100644 --- a/14.0-rc/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -85,7 +85,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 14.0.0RC2 +ENV NEXTCLOUD_VERSION 14.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -94,9 +94,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 --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/14.0-rc/fpm-alpine/config/apcu.config.php b/14.0/fpm-alpine/config/apcu.config.php similarity index 100% rename from 14.0-rc/fpm-alpine/config/apcu.config.php rename to 14.0/fpm-alpine/config/apcu.config.php diff --git a/14.0-rc/fpm-alpine/config/apps.config.php b/14.0/fpm-alpine/config/apps.config.php similarity index 100% rename from 14.0-rc/fpm-alpine/config/apps.config.php rename to 14.0/fpm-alpine/config/apps.config.php diff --git a/14.0-rc/fpm-alpine/config/autoconfig.php b/14.0/fpm-alpine/config/autoconfig.php similarity index 100% rename from 14.0-rc/fpm-alpine/config/autoconfig.php rename to 14.0/fpm-alpine/config/autoconfig.php diff --git a/14.0-rc/fpm-alpine/cron.sh b/14.0/fpm-alpine/cron.sh similarity index 100% rename from 14.0-rc/fpm-alpine/cron.sh rename to 14.0/fpm-alpine/cron.sh diff --git a/14.0-rc/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh similarity index 100% rename from 14.0-rc/fpm-alpine/entrypoint.sh rename to 14.0/fpm-alpine/entrypoint.sh diff --git a/14.0-rc/fpm/Dockerfile b/14.0/fpm/Dockerfile similarity index 94% rename from 14.0-rc/fpm/Dockerfile rename to 14.0/fpm/Dockerfile index c56484f..132efb1 100644 --- a/14.0-rc/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -96,7 +96,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 14.0.0RC2 +ENV NEXTCLOUD_VERSION 14.0.0 RUN set -ex; \ fetchDeps=" \ @@ -107,9 +107,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 --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/14.0-rc/fpm/config/apcu.config.php b/14.0/fpm/config/apcu.config.php similarity index 100% rename from 14.0-rc/fpm/config/apcu.config.php rename to 14.0/fpm/config/apcu.config.php diff --git a/14.0-rc/fpm/config/apps.config.php b/14.0/fpm/config/apps.config.php similarity index 100% rename from 14.0-rc/fpm/config/apps.config.php rename to 14.0/fpm/config/apps.config.php diff --git a/14.0-rc/fpm/config/autoconfig.php b/14.0/fpm/config/autoconfig.php similarity index 100% rename from 14.0-rc/fpm/config/autoconfig.php rename to 14.0/fpm/config/autoconfig.php diff --git a/14.0-rc/fpm/cron.sh b/14.0/fpm/cron.sh similarity index 100% rename from 14.0-rc/fpm/cron.sh rename to 14.0/fpm/cron.sh diff --git a/14.0-rc/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh similarity index 100% rename from 14.0-rc/fpm/entrypoint.sh rename to 14.0/fpm/entrypoint.sh