summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2020-01-17 21:28:55 +0100
committerGitHub <noreply@github.com>2020-01-17 21:28:55 +0100
commitcef7ec58da449bf78729c5781e8e49f236f6c032 (patch)
tree5eef46bc72d558fb230552b90521c93917b6eb1a
parent13be446667270de43ebe8e88985542ab8e13f733 (diff)
parentc8fe9f30559a9562f94bc15e2329c8532a3660b9 (diff)
Merge pull request #967 from tilosp/bot/update
Update to 18.0.0
-rw-r--r--.travis.yml14
-rw-r--r--18.0/apache/Dockerfile (renamed from 18.0-rc/apache/Dockerfile)6
-rw-r--r--18.0/apache/config/apache-pretty-urls.config.php (renamed from 18.0-rc/apache/config/apache-pretty-urls.config.php)0
-rw-r--r--18.0/apache/config/apcu.config.php (renamed from 18.0-rc/apache/config/apcu.config.php)0
-rw-r--r--18.0/apache/config/apps.config.php (renamed from 18.0-rc/apache/config/apps.config.php)0
-rw-r--r--18.0/apache/config/autoconfig.php (renamed from 18.0-rc/apache/config/autoconfig.php)0
-rw-r--r--18.0/apache/config/redis.config.php (renamed from 18.0-rc/apache/config/redis.config.php)0
-rw-r--r--18.0/apache/config/smtp.config.php (renamed from 18.0-rc/apache/config/smtp.config.php)0
-rwxr-xr-x18.0/apache/cron.sh (renamed from 18.0-rc/apache/cron.sh)0
-rwxr-xr-x18.0/apache/entrypoint.sh (renamed from 18.0-rc/apache/entrypoint.sh)0
-rw-r--r--18.0/apache/upgrade.exclude (renamed from 18.0-rc/apache/upgrade.exclude)0
-rw-r--r--18.0/fpm-alpine/Dockerfile (renamed from 18.0-rc/fpm-alpine/Dockerfile)6
-rw-r--r--18.0/fpm-alpine/config/apcu.config.php (renamed from 18.0-rc/fpm-alpine/config/apcu.config.php)0
-rw-r--r--18.0/fpm-alpine/config/apps.config.php (renamed from 18.0-rc/fpm-alpine/config/apps.config.php)0
-rw-r--r--18.0/fpm-alpine/config/autoconfig.php (renamed from 18.0-rc/fpm-alpine/config/autoconfig.php)0
-rw-r--r--18.0/fpm-alpine/config/redis.config.php (renamed from 18.0-rc/fpm-alpine/config/redis.config.php)0
-rw-r--r--18.0/fpm-alpine/config/smtp.config.php (renamed from 18.0-rc/fpm-alpine/config/smtp.config.php)0
-rwxr-xr-x18.0/fpm-alpine/cron.sh (renamed from 18.0-rc/fpm-alpine/cron.sh)0
-rwxr-xr-x18.0/fpm-alpine/entrypoint.sh (renamed from 18.0-rc/fpm-alpine/entrypoint.sh)0
-rw-r--r--18.0/fpm-alpine/upgrade.exclude (renamed from 18.0-rc/fpm-alpine/upgrade.exclude)0
-rw-r--r--18.0/fpm/Dockerfile (renamed from 18.0-rc/fpm/Dockerfile)6
-rw-r--r--18.0/fpm/config/apcu.config.php (renamed from 18.0-rc/fpm/config/apcu.config.php)0
-rw-r--r--18.0/fpm/config/apps.config.php (renamed from 18.0-rc/fpm/config/apps.config.php)0
-rw-r--r--18.0/fpm/config/autoconfig.php (renamed from 18.0-rc/fpm/config/autoconfig.php)0
-rw-r--r--18.0/fpm/config/redis.config.php (renamed from 18.0-rc/fpm/config/redis.config.php)0
-rw-r--r--18.0/fpm/config/smtp.config.php (renamed from 18.0-rc/fpm/config/smtp.config.php)0
-rwxr-xr-x18.0/fpm/cron.sh (renamed from 18.0-rc/fpm/cron.sh)0
-rwxr-xr-x18.0/fpm/entrypoint.sh (renamed from 18.0-rc/fpm/entrypoint.sh)0
-rw-r--r--18.0/fpm/upgrade.exclude (renamed from 18.0-rc/fpm/upgrade.exclude)0
29 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a17411c..016b2490 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
index cba8f987..9486e9c2 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
index 72da1d8c..72da1d8c 100644
--- a/18.0-rc/apache/config/apache-pretty-urls.config.php
+++ b/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
index 69fed876..69fed876 100644
--- a/18.0-rc/apache/config/apcu.config.php
+++ b/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
index a4bed833..a4bed833 100644
--- a/18.0-rc/apache/config/apps.config.php
+++ b/18.0/apache/config/apps.config.php
diff --git a/18.0-rc/apache/config/autoconfig.php b/18.0/apache/config/autoconfig.php
index deeabe4e..deeabe4e 100644
--- a/18.0-rc/apache/config/autoconfig.php
+++ b/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
index 9429c901..9429c901 100644
--- a/18.0-rc/apache/config/redis.config.php
+++ b/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
index 59f1eaa1..59f1eaa1 100644
--- a/18.0-rc/apache/config/smtp.config.php
+++ b/18.0/apache/config/smtp.config.php
diff --git a/18.0-rc/apache/cron.sh b/18.0/apache/cron.sh
index 4dfa4118..4dfa4118 100755
--- a/18.0-rc/apache/cron.sh
+++ b/18.0/apache/cron.sh
diff --git a/18.0-rc/apache/entrypoint.sh b/18.0/apache/entrypoint.sh
index fb2fe686..fb2fe686 100755
--- a/18.0-rc/apache/entrypoint.sh
+++ b/18.0/apache/entrypoint.sh
diff --git a/18.0-rc/apache/upgrade.exclude b/18.0/apache/upgrade.exclude
index 354864da..354864da 100644
--- a/18.0-rc/apache/upgrade.exclude
+++ b/18.0/apache/upgrade.exclude
diff --git a/18.0-rc/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile
index 04994103..e532ca50 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
index 69fed876..69fed876 100644
--- a/18.0-rc/fpm-alpine/config/apcu.config.php
+++ b/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
index a4bed833..a4bed833 100644
--- a/18.0-rc/fpm-alpine/config/apps.config.php
+++ b/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
index deeabe4e..deeabe4e 100644
--- a/18.0-rc/fpm-alpine/config/autoconfig.php
+++ b/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
index 9429c901..9429c901 100644
--- a/18.0-rc/fpm-alpine/config/redis.config.php
+++ b/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
index 59f1eaa1..59f1eaa1 100644
--- a/18.0-rc/fpm-alpine/config/smtp.config.php
+++ b/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
index 4dfa4118..4dfa4118 100755
--- a/18.0-rc/fpm-alpine/cron.sh
+++ b/18.0/fpm-alpine/cron.sh
diff --git a/18.0-rc/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh
index fb2fe686..fb2fe686 100755
--- a/18.0-rc/fpm-alpine/entrypoint.sh
+++ b/18.0/fpm-alpine/entrypoint.sh
diff --git a/18.0-rc/fpm-alpine/upgrade.exclude b/18.0/fpm-alpine/upgrade.exclude
index 354864da..354864da 100644
--- a/18.0-rc/fpm-alpine/upgrade.exclude
+++ b/18.0/fpm-alpine/upgrade.exclude
diff --git a/18.0-rc/fpm/Dockerfile b/18.0/fpm/Dockerfile
index a29d6024..801e3080 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
index 69fed876..69fed876 100644
--- a/18.0-rc/fpm/config/apcu.config.php
+++ b/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
index a4bed833..a4bed833 100644
--- a/18.0-rc/fpm/config/apps.config.php
+++ b/18.0/fpm/config/apps.config.php
diff --git a/18.0-rc/fpm/config/autoconfig.php b/18.0/fpm/config/autoconfig.php
index deeabe4e..deeabe4e 100644
--- a/18.0-rc/fpm/config/autoconfig.php
+++ b/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
index 9429c901..9429c901 100644
--- a/18.0-rc/fpm/config/redis.config.php
+++ b/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
index 59f1eaa1..59f1eaa1 100644
--- a/18.0-rc/fpm/config/smtp.config.php
+++ b/18.0/fpm/config/smtp.config.php
diff --git a/18.0-rc/fpm/cron.sh b/18.0/fpm/cron.sh
index 4dfa4118..4dfa4118 100755
--- a/18.0-rc/fpm/cron.sh
+++ b/18.0/fpm/cron.sh
diff --git a/18.0-rc/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh
index fb2fe686..fb2fe686 100755
--- a/18.0-rc/fpm/entrypoint.sh
+++ b/18.0/fpm/entrypoint.sh
diff --git a/18.0-rc/fpm/upgrade.exclude b/18.0/fpm/upgrade.exclude
index 354864da..354864da 100644
--- a/18.0-rc/fpm/upgrade.exclude
+++ b/18.0/fpm/upgrade.exclude