Merge pull request nextcloud#862 from tilosp/bot/update

Update to 17.0.0RC1
josephway · Sep 13, 2019 · cc2952f · cc2952f
2 parents 73ff5c8 + 7d0e49e
commit cc2952f
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 9 deletions.
diff --git 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 → 17.0-rc/apache/Dockerfile b/17.0-beta/apache/Dockerfile → 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/...ache/config/apache-pretty-urls.config.php → ...ache/config/apache-pretty-urls.config.php b/...ache/config/apache-pretty-urls.config.php → ...ache/config/apache-pretty-urls.config.php
diff --git a/17.0-beta/apache/config/apcu.config.php → 17.0-rc/apache/config/apcu.config.php b/17.0-beta/apache/config/apcu.config.php → 17.0-rc/apache/config/apcu.config.php
diff --git a/17.0-beta/apache/config/apps.config.php → 17.0-rc/apache/config/apps.config.php b/17.0-beta/apache/config/apps.config.php → 17.0-rc/apache/config/apps.config.php
diff --git a/17.0-beta/apache/config/autoconfig.php → 17.0-rc/apache/config/autoconfig.php b/17.0-beta/apache/config/autoconfig.php → 17.0-rc/apache/config/autoconfig.php
diff --git a/17.0-beta/apache/config/redis.config.php → 17.0-rc/apache/config/redis.config.php b/17.0-beta/apache/config/redis.config.php → 17.0-rc/apache/config/redis.config.php
diff --git a/17.0-beta/apache/config/smtp.config.php → 17.0-rc/apache/config/smtp.config.php b/17.0-beta/apache/config/smtp.config.php → 17.0-rc/apache/config/smtp.config.php
diff --git a/17.0-beta/apache/cron.sh → 17.0-rc/apache/cron.sh b/17.0-beta/apache/cron.sh → 17.0-rc/apache/cron.sh
diff --git a/17.0-beta/apache/entrypoint.sh → 17.0-rc/apache/entrypoint.sh b/17.0-beta/apache/entrypoint.sh → 17.0-rc/apache/entrypoint.sh
diff --git a/17.0-beta/apache/upgrade.exclude → 17.0-rc/apache/upgrade.exclude b/17.0-beta/apache/upgrade.exclude → 17.0-rc/apache/upgrade.exclude
diff --git a/17.0-beta/fpm-alpine/Dockerfile → 17.0-rc/fpm-alpine/Dockerfile b/17.0-beta/fpm-alpine/Dockerfile → 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 → 17.0-rc/fpm-alpine/config/apcu.config.php b/17.0-beta/fpm-alpine/config/apcu.config.php → 17.0-rc/fpm-alpine/config/apcu.config.php
diff --git a/17.0-beta/fpm-alpine/config/apps.config.php → 17.0-rc/fpm-alpine/config/apps.config.php b/17.0-beta/fpm-alpine/config/apps.config.php → 17.0-rc/fpm-alpine/config/apps.config.php
diff --git a/17.0-beta/fpm-alpine/config/autoconfig.php → 17.0-rc/fpm-alpine/config/autoconfig.php b/17.0-beta/fpm-alpine/config/autoconfig.php → 17.0-rc/fpm-alpine/config/autoconfig.php
diff --git a/17.0-beta/fpm-alpine/config/redis.config.php → 17.0-rc/fpm-alpine/config/redis.config.php b/17.0-beta/fpm-alpine/config/redis.config.php → 17.0-rc/fpm-alpine/config/redis.config.php
diff --git a/17.0-beta/fpm-alpine/config/smtp.config.php → 17.0-rc/fpm-alpine/config/smtp.config.php b/17.0-beta/fpm-alpine/config/smtp.config.php → 17.0-rc/fpm-alpine/config/smtp.config.php
diff --git a/17.0-beta/fpm-alpine/cron.sh → 17.0-rc/fpm-alpine/cron.sh b/17.0-beta/fpm-alpine/cron.sh → 17.0-rc/fpm-alpine/cron.sh
diff --git a/17.0-beta/fpm-alpine/entrypoint.sh → 17.0-rc/fpm-alpine/entrypoint.sh b/17.0-beta/fpm-alpine/entrypoint.sh → 17.0-rc/fpm-alpine/entrypoint.sh
diff --git a/17.0-beta/fpm-alpine/upgrade.exclude → 17.0-rc/fpm-alpine/upgrade.exclude b/17.0-beta/fpm-alpine/upgrade.exclude → 17.0-rc/fpm-alpine/upgrade.exclude
diff --git a/17.0-beta/fpm/Dockerfile → 17.0-rc/fpm/Dockerfile b/17.0-beta/fpm/Dockerfile → 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 → 17.0-rc/fpm/config/apcu.config.php b/17.0-beta/fpm/config/apcu.config.php → 17.0-rc/fpm/config/apcu.config.php
diff --git a/17.0-beta/fpm/config/apps.config.php → 17.0-rc/fpm/config/apps.config.php b/17.0-beta/fpm/config/apps.config.php → 17.0-rc/fpm/config/apps.config.php
diff --git a/17.0-beta/fpm/config/autoconfig.php → 17.0-rc/fpm/config/autoconfig.php b/17.0-beta/fpm/config/autoconfig.php → 17.0-rc/fpm/config/autoconfig.php
diff --git a/17.0-beta/fpm/config/redis.config.php → 17.0-rc/fpm/config/redis.config.php b/17.0-beta/fpm/config/redis.config.php → 17.0-rc/fpm/config/redis.config.php
diff --git a/17.0-beta/fpm/config/smtp.config.php → 17.0-rc/fpm/config/smtp.config.php b/17.0-beta/fpm/config/smtp.config.php → 17.0-rc/fpm/config/smtp.config.php
diff --git a/17.0-beta/fpm/cron.sh → 17.0-rc/fpm/cron.sh b/17.0-beta/fpm/cron.sh → 17.0-rc/fpm/cron.sh
diff --git a/17.0-beta/fpm/entrypoint.sh → 17.0-rc/fpm/entrypoint.sh b/17.0-beta/fpm/entrypoint.sh → 17.0-rc/fpm/entrypoint.sh
diff --git a/17.0-beta/fpm/upgrade.exclude → 17.0-rc/fpm/upgrade.exclude b/17.0-beta/fpm/upgrade.exclude → 17.0-rc/fpm/upgrade.exclude