diff options
author | J0WI <J0WI@users.noreply.github.com> | 2019-04-26 14:17:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-26 14:17:27 +0200 |
commit | 45b1779c6f08f7a5e347f45ca28449def36bf663 (patch) | |
tree | 1ff9d56f2731adc4ba7d5141729e0e32f9623808 | |
parent | 7a96e8b5ad48a014d5a9833543ea1ed0aa885522 (diff) | |
parent | abe7b700523a3b9660314b57ed00eda25712b6fa (diff) |
Merge pull request #724 from J0WI/nc16
Run update.sh
-rw-r--r-- | .travis.yml | 14 | ||||
-rw-r--r-- | 16.0/apache/Dockerfile (renamed from 16.0-rc/apache/Dockerfile) | 6 | ||||
-rw-r--r-- | 16.0/apache/config/apache-pretty-urls.config.php (renamed from 16.0-rc/apache/config/apache-pretty-urls.config.php) | 0 | ||||
-rw-r--r-- | 16.0/apache/config/apcu.config.php (renamed from 16.0-rc/apache/config/apcu.config.php) | 0 | ||||
-rw-r--r-- | 16.0/apache/config/apps.config.php (renamed from 16.0-rc/apache/config/apps.config.php) | 0 | ||||
-rw-r--r-- | 16.0/apache/config/autoconfig.php (renamed from 16.0-rc/apache/config/autoconfig.php) | 0 | ||||
-rw-r--r-- | 16.0/apache/config/redis.config.php (renamed from 16.0-rc/apache/config/redis.config.php) | 0 | ||||
-rwxr-xr-x | 16.0/apache/cron.sh (renamed from 16.0-rc/apache/cron.sh) | 0 | ||||
-rwxr-xr-x | 16.0/apache/entrypoint.sh (renamed from 16.0-rc/apache/entrypoint.sh) | 0 | ||||
-rw-r--r-- | 16.0/apache/upgrade.exclude (renamed from 16.0-rc/apache/upgrade.exclude) | 0 | ||||
-rw-r--r-- | 16.0/fpm-alpine/Dockerfile (renamed from 16.0-rc/fpm-alpine/Dockerfile) | 6 | ||||
-rw-r--r-- | 16.0/fpm-alpine/config/apcu.config.php (renamed from 16.0-rc/fpm-alpine/config/apcu.config.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm-alpine/config/apps.config.php (renamed from 16.0-rc/fpm-alpine/config/apps.config.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm-alpine/config/autoconfig.php (renamed from 16.0-rc/fpm-alpine/config/autoconfig.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm-alpine/config/redis.config.php (renamed from 16.0-rc/fpm-alpine/config/redis.config.php) | 0 | ||||
-rwxr-xr-x | 16.0/fpm-alpine/cron.sh (renamed from 16.0-rc/fpm-alpine/cron.sh) | 0 | ||||
-rwxr-xr-x | 16.0/fpm-alpine/entrypoint.sh (renamed from 16.0-rc/fpm-alpine/entrypoint.sh) | 0 | ||||
-rw-r--r-- | 16.0/fpm-alpine/upgrade.exclude (renamed from 16.0-rc/fpm-alpine/upgrade.exclude) | 0 | ||||
-rw-r--r-- | 16.0/fpm/Dockerfile (renamed from 16.0-rc/fpm/Dockerfile) | 6 | ||||
-rw-r--r-- | 16.0/fpm/config/apcu.config.php (renamed from 16.0-rc/fpm/config/apcu.config.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm/config/apps.config.php (renamed from 16.0-rc/fpm/config/apps.config.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm/config/autoconfig.php (renamed from 16.0-rc/fpm/config/autoconfig.php) | 0 | ||||
-rw-r--r-- | 16.0/fpm/config/redis.config.php (renamed from 16.0-rc/fpm/config/redis.config.php) | 0 | ||||
-rwxr-xr-x | 16.0/fpm/cron.sh (renamed from 16.0-rc/fpm/cron.sh) | 0 | ||||
-rwxr-xr-x | 16.0/fpm/entrypoint.sh (renamed from 16.0-rc/fpm/entrypoint.sh) | 0 | ||||
-rw-r--r-- | 16.0/fpm/upgrade.exclude (renamed from 16.0-rc/fpm/upgrade.exclude) | 0 |
26 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 99612455..84d805c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,7 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=16.0-rc VARIANT=fpm ARCH=amd64 - - env: VERSION=16.0-rc VARIANT=fpm ARCH=i386 - - env: VERSION=16.0-rc VARIANT=apache ARCH=amd64 - - env: VERSION=16.0-rc VARIANT=apache ARCH=i386 - - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=amd64 + 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 @@ -68,3 +62,9 @@ jobs: - env: VERSION=15.0 VARIANT=fpm ARCH=i386 - env: VERSION=15.0 VARIANT=apache ARCH=amd64 - env: VERSION=15.0 VARIANT=apache ARCH=i386 + - 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 + - env: VERSION=16.0 VARIANT=apache ARCH=amd64 + - env: VERSION=16.0 VARIANT=apache ARCH=i386 diff --git a/16.0-rc/apache/Dockerfile b/16.0/apache/Dockerfile index 4efbff6c..b54fc5bd 100644 --- a/16.0-rc/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -111,7 +111,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 16.0.0RC2 +ENV NEXTCLOUD_VERSION 16.0.0 RUN set -ex; \ fetchDeps=" \ @@ -122,9 +122,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/16.0-rc/apache/config/apache-pretty-urls.config.php b/16.0/apache/config/apache-pretty-urls.config.php index 72da1d8c..72da1d8c 100644 --- a/16.0-rc/apache/config/apache-pretty-urls.config.php +++ b/16.0/apache/config/apache-pretty-urls.config.php diff --git a/16.0-rc/apache/config/apcu.config.php b/16.0/apache/config/apcu.config.php index 69fed876..69fed876 100644 --- a/16.0-rc/apache/config/apcu.config.php +++ b/16.0/apache/config/apcu.config.php diff --git a/16.0-rc/apache/config/apps.config.php b/16.0/apache/config/apps.config.php index a4bed833..a4bed833 100644 --- a/16.0-rc/apache/config/apps.config.php +++ b/16.0/apache/config/apps.config.php diff --git a/16.0-rc/apache/config/autoconfig.php b/16.0/apache/config/autoconfig.php index 85e02212..85e02212 100644 --- a/16.0-rc/apache/config/autoconfig.php +++ b/16.0/apache/config/autoconfig.php diff --git a/16.0-rc/apache/config/redis.config.php b/16.0/apache/config/redis.config.php index 5df799f2..5df799f2 100644 --- a/16.0-rc/apache/config/redis.config.php +++ b/16.0/apache/config/redis.config.php diff --git a/16.0-rc/apache/cron.sh b/16.0/apache/cron.sh index 4dfa4118..4dfa4118 100755 --- a/16.0-rc/apache/cron.sh +++ b/16.0/apache/cron.sh diff --git a/16.0-rc/apache/entrypoint.sh b/16.0/apache/entrypoint.sh index 6ef2540e..6ef2540e 100755 --- a/16.0-rc/apache/entrypoint.sh +++ b/16.0/apache/entrypoint.sh diff --git a/16.0-rc/apache/upgrade.exclude b/16.0/apache/upgrade.exclude index 354864da..354864da 100644 --- a/16.0-rc/apache/upgrade.exclude +++ b/16.0/apache/upgrade.exclude diff --git a/16.0-rc/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile index e5c347b9..c5f2326e 100644 --- a/16.0-rc/fpm-alpine/Dockerfile +++ b/16.0/fpm-alpine/Dockerfile @@ -92,7 +92,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 16.0.0RC2 +ENV NEXTCLOUD_VERSION 16.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -101,9 +101,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/16.0-rc/fpm-alpine/config/apcu.config.php b/16.0/fpm-alpine/config/apcu.config.php index 69fed876..69fed876 100644 --- a/16.0-rc/fpm-alpine/config/apcu.config.php +++ b/16.0/fpm-alpine/config/apcu.config.php diff --git a/16.0-rc/fpm-alpine/config/apps.config.php b/16.0/fpm-alpine/config/apps.config.php index a4bed833..a4bed833 100644 --- a/16.0-rc/fpm-alpine/config/apps.config.php +++ b/16.0/fpm-alpine/config/apps.config.php diff --git a/16.0-rc/fpm-alpine/config/autoconfig.php b/16.0/fpm-alpine/config/autoconfig.php index 85e02212..85e02212 100644 --- a/16.0-rc/fpm-alpine/config/autoconfig.php +++ b/16.0/fpm-alpine/config/autoconfig.php diff --git a/16.0-rc/fpm-alpine/config/redis.config.php b/16.0/fpm-alpine/config/redis.config.php index 5df799f2..5df799f2 100644 --- a/16.0-rc/fpm-alpine/config/redis.config.php +++ b/16.0/fpm-alpine/config/redis.config.php diff --git a/16.0-rc/fpm-alpine/cron.sh b/16.0/fpm-alpine/cron.sh index 4dfa4118..4dfa4118 100755 --- a/16.0-rc/fpm-alpine/cron.sh +++ b/16.0/fpm-alpine/cron.sh diff --git a/16.0-rc/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh index 6ef2540e..6ef2540e 100755 --- a/16.0-rc/fpm-alpine/entrypoint.sh +++ b/16.0/fpm-alpine/entrypoint.sh diff --git a/16.0-rc/fpm-alpine/upgrade.exclude b/16.0/fpm-alpine/upgrade.exclude index 354864da..354864da 100644 --- a/16.0-rc/fpm-alpine/upgrade.exclude +++ b/16.0/fpm-alpine/upgrade.exclude diff --git a/16.0-rc/fpm/Dockerfile b/16.0/fpm/Dockerfile index 765e8b19..840c74b0 100644 --- a/16.0-rc/fpm/Dockerfile +++ b/16.0/fpm/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 16.0.0RC2 +ENV NEXTCLOUD_VERSION 16.0.0 RUN set -ex; \ fetchDeps=" \ @@ -114,9 +114,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/16.0-rc/fpm/config/apcu.config.php b/16.0/fpm/config/apcu.config.php index 69fed876..69fed876 100644 --- a/16.0-rc/fpm/config/apcu.config.php +++ b/16.0/fpm/config/apcu.config.php diff --git a/16.0-rc/fpm/config/apps.config.php b/16.0/fpm/config/apps.config.php index a4bed833..a4bed833 100644 --- a/16.0-rc/fpm/config/apps.config.php +++ b/16.0/fpm/config/apps.config.php diff --git a/16.0-rc/fpm/config/autoconfig.php b/16.0/fpm/config/autoconfig.php index 85e02212..85e02212 100644 --- a/16.0-rc/fpm/config/autoconfig.php +++ b/16.0/fpm/config/autoconfig.php diff --git a/16.0-rc/fpm/config/redis.config.php b/16.0/fpm/config/redis.config.php index 5df799f2..5df799f2 100644 --- a/16.0-rc/fpm/config/redis.config.php +++ b/16.0/fpm/config/redis.config.php diff --git a/16.0-rc/fpm/cron.sh b/16.0/fpm/cron.sh index 4dfa4118..4dfa4118 100755 --- a/16.0-rc/fpm/cron.sh +++ b/16.0/fpm/cron.sh diff --git a/16.0-rc/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh index 6ef2540e..6ef2540e 100755 --- a/16.0-rc/fpm/entrypoint.sh +++ b/16.0/fpm/entrypoint.sh diff --git a/16.0-rc/fpm/upgrade.exclude b/16.0/fpm/upgrade.exclude index 354864da..354864da 100644 --- a/16.0-rc/fpm/upgrade.exclude +++ b/16.0/fpm/upgrade.exclude |