summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2019-09-13 11:16:37 +0200
committerGitHub <noreply@github.com>2019-09-13 11:16:37 +0200
commitcc2952f6f5f78b41dabb099814305251fdaa762c (patch)
tree094009c08e071ff6906822c7bdf075c15097f8b7
parent73ff5c860d155d46ed65b6ae9caa9ee6e64478de (diff)
parent7d0e49e5dd0ad4d721492ab04fde33111256d301 (diff)
Merge pull request #862 from tilosp/bot/update
Update to 17.0.0RC1
-rw-r--r--.travis.yml14
-rw-r--r--17.0-rc/apache/Dockerfile (renamed from 17.0-beta/apache/Dockerfile)2
-rw-r--r--17.0-rc/apache/config/apache-pretty-urls.config.php (renamed from 17.0-beta/apache/config/apache-pretty-urls.config.php)0
-rw-r--r--17.0-rc/apache/config/apcu.config.php (renamed from 17.0-beta/apache/config/apcu.config.php)0
-rw-r--r--17.0-rc/apache/config/apps.config.php (renamed from 17.0-beta/apache/config/apps.config.php)0
-rw-r--r--17.0-rc/apache/config/autoconfig.php (renamed from 17.0-beta/apache/config/autoconfig.php)0
-rw-r--r--17.0-rc/apache/config/redis.config.php (renamed from 17.0-beta/apache/config/redis.config.php)0
-rw-r--r--17.0-rc/apache/config/smtp.config.php (renamed from 17.0-beta/apache/config/smtp.config.php)0
-rwxr-xr-x17.0-rc/apache/cron.sh (renamed from 17.0-beta/apache/cron.sh)0
-rwxr-xr-x17.0-rc/apache/entrypoint.sh (renamed from 17.0-beta/apache/entrypoint.sh)0
-rw-r--r--17.0-rc/apache/upgrade.exclude (renamed from 17.0-beta/apache/upgrade.exclude)0
-rw-r--r--17.0-rc/fpm-alpine/Dockerfile (renamed from 17.0-beta/fpm-alpine/Dockerfile)2
-rw-r--r--17.0-rc/fpm-alpine/config/apcu.config.php (renamed from 17.0-beta/fpm-alpine/config/apcu.config.php)0
-rw-r--r--17.0-rc/fpm-alpine/config/apps.config.php (renamed from 17.0-beta/fpm-alpine/config/apps.config.php)0
-rw-r--r--17.0-rc/fpm-alpine/config/autoconfig.php (renamed from 17.0-beta/fpm-alpine/config/autoconfig.php)0
-rw-r--r--17.0-rc/fpm-alpine/config/redis.config.php (renamed from 17.0-beta/fpm-alpine/config/redis.config.php)0
-rw-r--r--17.0-rc/fpm-alpine/config/smtp.config.php (renamed from 17.0-beta/fpm-alpine/config/smtp.config.php)0
-rwxr-xr-x17.0-rc/fpm-alpine/cron.sh (renamed from 17.0-beta/fpm-alpine/cron.sh)0
-rwxr-xr-x17.0-rc/fpm-alpine/entrypoint.sh (renamed from 17.0-beta/fpm-alpine/entrypoint.sh)0
-rw-r--r--17.0-rc/fpm-alpine/upgrade.exclude (renamed from 17.0-beta/fpm-alpine/upgrade.exclude)0
-rw-r--r--17.0-rc/fpm/Dockerfile (renamed from 17.0-beta/fpm/Dockerfile)2
-rw-r--r--17.0-rc/fpm/config/apcu.config.php (renamed from 17.0-beta/fpm/config/apcu.config.php)0
-rw-r--r--17.0-rc/fpm/config/apps.config.php (renamed from 17.0-beta/fpm/config/apps.config.php)0
-rw-r--r--17.0-rc/fpm/config/autoconfig.php (renamed from 17.0-beta/fpm/config/autoconfig.php)0
-rw-r--r--17.0-rc/fpm/config/redis.config.php (renamed from 17.0-beta/fpm/config/redis.config.php)0
-rw-r--r--17.0-rc/fpm/config/smtp.config.php (renamed from 17.0-beta/fpm/config/smtp.config.php)0
-rwxr-xr-x17.0-rc/fpm/cron.sh (renamed from 17.0-beta/fpm/cron.sh)0
-rwxr-xr-x17.0-rc/fpm/entrypoint.sh (renamed from 17.0-beta/fpm/entrypoint.sh)0
-rw-r--r--17.0-rc/fpm/upgrade.exclude (renamed from 17.0-beta/fpm/upgrade.exclude)0
29 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index f93b582f..42330d41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,8 +37,10 @@ jobs:
allow_failures:
- env: VERSION=15.0 VARIANT=apache ARCH=i386
- env: VERSION=16.0 VARIANT=apache ARCH=i386
+ - env: VERSION=17.0 VARIANT=apache ARCH=i386
- env: VERSION=15.0-rc VARIANT=apache ARCH=i386
- env: VERSION=16.0-rc VARIANT=apache ARCH=i386
+ - env: VERSION=17.0-rc VARIANT=apache ARCH=i386
- env: VERSION=17.0-beta VARIANT=apache ARCH=i386
include:
- &test-scripts
@@ -62,12 +64,12 @@ jobs:
- travis_retry ./generate-stackbrew-library.sh
- stage: test images
- env: VERSION=17.0-beta VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=17.0-beta VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=17.0-beta VARIANT=fpm ARCH=amd64
- - env: VERSION=17.0-beta VARIANT=fpm ARCH=i386
- - env: VERSION=17.0-beta VARIANT=apache ARCH=amd64
- - env: VERSION=17.0-beta VARIANT=apache ARCH=i386
+ env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=amd64
+ - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=i386
+ - env: VERSION=17.0-rc VARIANT=fpm ARCH=amd64
+ - env: VERSION=17.0-rc VARIANT=fpm ARCH=i386
+ - env: VERSION=17.0-rc VARIANT=apache ARCH=amd64
+ - env: VERSION=17.0-rc 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
diff --git a/17.0-beta/apache/Dockerfile b/17.0-rc/apache/Dockerfile
index f64835ce..a6df22f4 100644
--- a/17.0-beta/apache/Dockerfile
+++ b/17.0-rc/apache/Dockerfile
@@ -111,7 +111,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 17.0.0beta4
+ENV NEXTCLOUD_VERSION 17.0.0RC1
RUN set -ex; \
fetchDeps=" \
diff --git a/17.0-beta/apache/config/apache-pretty-urls.config.php b/17.0-rc/apache/config/apache-pretty-urls.config.php
index 72da1d8c..72da1d8c 100644
--- a/17.0-beta/apache/config/apache-pretty-urls.config.php
+++ b/17.0-rc/apache/config/apache-pretty-urls.config.php
diff --git a/17.0-beta/apache/config/apcu.config.php b/17.0-rc/apache/config/apcu.config.php
index 69fed876..69fed876 100644
--- a/17.0-beta/apache/config/apcu.config.php
+++ b/17.0-rc/apache/config/apcu.config.php
diff --git a/17.0-beta/apache/config/apps.config.php b/17.0-rc/apache/config/apps.config.php
index a4bed833..a4bed833 100644
--- a/17.0-beta/apache/config/apps.config.php
+++ b/17.0-rc/apache/config/apps.config.php
diff --git a/17.0-beta/apache/config/autoconfig.php b/17.0-rc/apache/config/autoconfig.php
index deeabe4e..deeabe4e 100644
--- a/17.0-beta/apache/config/autoconfig.php
+++ b/17.0-rc/apache/config/autoconfig.php
diff --git a/17.0-beta/apache/config/redis.config.php b/17.0-rc/apache/config/redis.config.php
index 19676160..19676160 100644
--- a/17.0-beta/apache/config/redis.config.php
+++ b/17.0-rc/apache/config/redis.config.php
diff --git a/17.0-beta/apache/config/smtp.config.php b/17.0-rc/apache/config/smtp.config.php
index 59f1eaa1..59f1eaa1 100644
--- a/17.0-beta/apache/config/smtp.config.php
+++ b/17.0-rc/apache/config/smtp.config.php
diff --git a/17.0-beta/apache/cron.sh b/17.0-rc/apache/cron.sh
index 4dfa4118..4dfa4118 100755
--- a/17.0-beta/apache/cron.sh
+++ b/17.0-rc/apache/cron.sh
diff --git a/17.0-beta/apache/entrypoint.sh b/17.0-rc/apache/entrypoint.sh
index 9514d881..9514d881 100755
--- a/17.0-beta/apache/entrypoint.sh
+++ b/17.0-rc/apache/entrypoint.sh
diff --git a/17.0-beta/apache/upgrade.exclude b/17.0-rc/apache/upgrade.exclude
index 354864da..354864da 100644
--- a/17.0-beta/apache/upgrade.exclude
+++ b/17.0-rc/apache/upgrade.exclude
diff --git a/17.0-beta/fpm-alpine/Dockerfile b/17.0-rc/fpm-alpine/Dockerfile
index dd56672e..2281b9d6 100644
--- a/17.0-beta/fpm-alpine/Dockerfile
+++ b/17.0-rc/fpm-alpine/Dockerfile
@@ -92,7 +92,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 17.0.0beta4
+ENV NEXTCLOUD_VERSION 17.0.0RC1
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/17.0-beta/fpm-alpine/config/apcu.config.php b/17.0-rc/fpm-alpine/config/apcu.config.php
index 69fed876..69fed876 100644
--- a/17.0-beta/fpm-alpine/config/apcu.config.php
+++ b/17.0-rc/fpm-alpine/config/apcu.config.php
diff --git a/17.0-beta/fpm-alpine/config/apps.config.php b/17.0-rc/fpm-alpine/config/apps.config.php
index a4bed833..a4bed833 100644
--- a/17.0-beta/fpm-alpine/config/apps.config.php
+++ b/17.0-rc/fpm-alpine/config/apps.config.php
diff --git a/17.0-beta/fpm-alpine/config/autoconfig.php b/17.0-rc/fpm-alpine/config/autoconfig.php
index deeabe4e..deeabe4e 100644
--- a/17.0-beta/fpm-alpine/config/autoconfig.php
+++ b/17.0-rc/fpm-alpine/config/autoconfig.php
diff --git a/17.0-beta/fpm-alpine/config/redis.config.php b/17.0-rc/fpm-alpine/config/redis.config.php
index 19676160..19676160 100644
--- a/17.0-beta/fpm-alpine/config/redis.config.php
+++ b/17.0-rc/fpm-alpine/config/redis.config.php
diff --git a/17.0-beta/fpm-alpine/config/smtp.config.php b/17.0-rc/fpm-alpine/config/smtp.config.php
index 59f1eaa1..59f1eaa1 100644
--- a/17.0-beta/fpm-alpine/config/smtp.config.php
+++ b/17.0-rc/fpm-alpine/config/smtp.config.php
diff --git a/17.0-beta/fpm-alpine/cron.sh b/17.0-rc/fpm-alpine/cron.sh
index 4dfa4118..4dfa4118 100755
--- a/17.0-beta/fpm-alpine/cron.sh
+++ b/17.0-rc/fpm-alpine/cron.sh
diff --git a/17.0-beta/fpm-alpine/entrypoint.sh b/17.0-rc/fpm-alpine/entrypoint.sh
index 9514d881..9514d881 100755
--- a/17.0-beta/fpm-alpine/entrypoint.sh
+++ b/17.0-rc/fpm-alpine/entrypoint.sh
diff --git a/17.0-beta/fpm-alpine/upgrade.exclude b/17.0-rc/fpm-alpine/upgrade.exclude
index 354864da..354864da 100644
--- a/17.0-beta/fpm-alpine/upgrade.exclude
+++ b/17.0-rc/fpm-alpine/upgrade.exclude
diff --git a/17.0-beta/fpm/Dockerfile b/17.0-rc/fpm/Dockerfile
index 670b977d..d850b7b4 100644
--- a/17.0-beta/fpm/Dockerfile
+++ b/17.0-rc/fpm/Dockerfile
@@ -103,7 +103,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 17.0.0beta4
+ENV NEXTCLOUD_VERSION 17.0.0RC1
RUN set -ex; \
fetchDeps=" \
diff --git a/17.0-beta/fpm/config/apcu.config.php b/17.0-rc/fpm/config/apcu.config.php
index 69fed876..69fed876 100644
--- a/17.0-beta/fpm/config/apcu.config.php
+++ b/17.0-rc/fpm/config/apcu.config.php
diff --git a/17.0-beta/fpm/config/apps.config.php b/17.0-rc/fpm/config/apps.config.php
index a4bed833..a4bed833 100644
--- a/17.0-beta/fpm/config/apps.config.php
+++ b/17.0-rc/fpm/config/apps.config.php
diff --git a/17.0-beta/fpm/config/autoconfig.php b/17.0-rc/fpm/config/autoconfig.php
index deeabe4e..deeabe4e 100644
--- a/17.0-beta/fpm/config/autoconfig.php
+++ b/17.0-rc/fpm/config/autoconfig.php
diff --git a/17.0-beta/fpm/config/redis.config.php b/17.0-rc/fpm/config/redis.config.php
index 19676160..19676160 100644
--- a/17.0-beta/fpm/config/redis.config.php
+++ b/17.0-rc/fpm/config/redis.config.php
diff --git a/17.0-beta/fpm/config/smtp.config.php b/17.0-rc/fpm/config/smtp.config.php
index 59f1eaa1..59f1eaa1 100644
--- a/17.0-beta/fpm/config/smtp.config.php
+++ b/17.0-rc/fpm/config/smtp.config.php
diff --git a/17.0-beta/fpm/cron.sh b/17.0-rc/fpm/cron.sh
index 4dfa4118..4dfa4118 100755
--- a/17.0-beta/fpm/cron.sh
+++ b/17.0-rc/fpm/cron.sh
diff --git a/17.0-beta/fpm/entrypoint.sh b/17.0-rc/fpm/entrypoint.sh
index 9514d881..9514d881 100755
--- a/17.0-beta/fpm/entrypoint.sh
+++ b/17.0-rc/fpm/entrypoint.sh
diff --git a/17.0-beta/fpm/upgrade.exclude b/17.0-rc/fpm/upgrade.exclude
index 354864da..354864da 100644
--- a/17.0-beta/fpm/upgrade.exclude
+++ b/17.0-rc/fpm/upgrade.exclude