diff --git a/.travis.yml b/.travis.yml index 0413d78e..01097948 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,12 +56,6 @@ jobs: - env: VERSION=15.0-rc VARIANT=fpm ARCH=i386 - env: VERSION=15.0-rc VARIANT=apache ARCH=amd64 - env: VERSION=15.0-rc VARIANT=apache ARCH=i386 - - 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 - - env: VERSION=12.0 VARIANT=apache ARCH=amd64 - - env: VERSION=12.0 VARIANT=apache ARCH=i386 - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=13.0 VARIANT=fpm ARCH=amd64 diff --git a/15.0-rc/apache/Dockerfile b/15.0-rc/apache/Dockerfile index 632e0fd5..a70f2a78 100644 --- a/15.0-rc/apache/Dockerfile +++ b/15.0-rc/apache/Dockerfile @@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 15.0.0RC1 +ENV NEXTCLOUD_VERSION 15.0.0RC3 RUN set -ex; \ fetchDeps=" \ diff --git a/15.0-rc/fpm-alpine/Dockerfile b/15.0-rc/fpm-alpine/Dockerfile index bf58ff67..c46ca38c 100644 --- a/15.0-rc/fpm-alpine/Dockerfile +++ b/15.0-rc/fpm-alpine/Dockerfile @@ -87,7 +87,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 15.0.0RC1 +ENV NEXTCLOUD_VERSION 15.0.0RC3 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/15.0-rc/fpm/Dockerfile b/15.0-rc/fpm/Dockerfile index 075ba6bd..dc356c2e 100644 --- a/15.0-rc/fpm/Dockerfile +++ b/15.0-rc/fpm/Dockerfile @@ -98,7 +98,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 15.0.0RC1 +ENV NEXTCLOUD_VERSION 15.0.0RC3 RUN set -ex; \ fetchDeps=" \ diff --git a/12.0/apache/Dockerfile b/15.0/apache/Dockerfile similarity index 98% rename from 12.0/apache/Dockerfile rename to 15.0/apache/Dockerfile index f09b23f5..64cfc36e 100644 --- a/12.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.1-apache-stretch +FROM php:7.2-apache-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 12.0.13 +ENV NEXTCLOUD_VERSION 15.0.0 RUN set -ex; \ fetchDeps=" \ diff --git a/12.0/apache/config/apache-pretty-urls.config.php b/15.0/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 12.0/apache/config/apache-pretty-urls.config.php rename to 15.0/apache/config/apache-pretty-urls.config.php diff --git a/12.0/apache/config/apcu.config.php b/15.0/apache/config/apcu.config.php similarity index 100% rename from 12.0/apache/config/apcu.config.php rename to 15.0/apache/config/apcu.config.php diff --git a/12.0/apache/config/apps.config.php b/15.0/apache/config/apps.config.php similarity index 100% rename from 12.0/apache/config/apps.config.php rename to 15.0/apache/config/apps.config.php diff --git a/12.0/apache/config/autoconfig.php b/15.0/apache/config/autoconfig.php similarity index 100% rename from 12.0/apache/config/autoconfig.php rename to 15.0/apache/config/autoconfig.php diff --git a/12.0/apache/cron.sh b/15.0/apache/cron.sh similarity index 100% rename from 12.0/apache/cron.sh rename to 15.0/apache/cron.sh diff --git a/12.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh similarity index 100% rename from 12.0/apache/entrypoint.sh rename to 15.0/apache/entrypoint.sh diff --git a/12.0/apache/upgrade.exclude b/15.0/apache/upgrade.exclude similarity index 100% rename from 12.0/apache/upgrade.exclude rename to 15.0/apache/upgrade.exclude diff --git a/12.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile similarity index 98% rename from 12.0/fpm-alpine/Dockerfile rename to 15.0/fpm-alpine/Dockerfile index fed71485..56044797 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.1-fpm-alpine3.8 +FROM php:7.2-fpm-alpine3.8 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -87,7 +87,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 12.0.13 +ENV NEXTCLOUD_VERSION 15.0.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/12.0/fpm-alpine/config/apcu.config.php b/15.0/fpm-alpine/config/apcu.config.php similarity index 100% rename from 12.0/fpm-alpine/config/apcu.config.php rename to 15.0/fpm-alpine/config/apcu.config.php diff --git a/12.0/fpm-alpine/config/apps.config.php b/15.0/fpm-alpine/config/apps.config.php similarity index 100% rename from 12.0/fpm-alpine/config/apps.config.php rename to 15.0/fpm-alpine/config/apps.config.php diff --git a/12.0/fpm-alpine/config/autoconfig.php b/15.0/fpm-alpine/config/autoconfig.php similarity index 100% rename from 12.0/fpm-alpine/config/autoconfig.php rename to 15.0/fpm-alpine/config/autoconfig.php diff --git a/12.0/fpm-alpine/cron.sh b/15.0/fpm-alpine/cron.sh similarity index 100% rename from 12.0/fpm-alpine/cron.sh rename to 15.0/fpm-alpine/cron.sh diff --git a/12.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh similarity index 100% rename from 12.0/fpm-alpine/entrypoint.sh rename to 15.0/fpm-alpine/entrypoint.sh diff --git a/12.0/fpm-alpine/upgrade.exclude b/15.0/fpm-alpine/upgrade.exclude similarity index 100% rename from 12.0/fpm-alpine/upgrade.exclude rename to 15.0/fpm-alpine/upgrade.exclude diff --git a/12.0/fpm/Dockerfile b/15.0/fpm/Dockerfile similarity index 98% rename from 12.0/fpm/Dockerfile rename to 15.0/fpm/Dockerfile index f45bb31a..06bd3da4 100644 --- a/12.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.1-fpm-stretch +FROM php:7.2-fpm-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -98,7 +98,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 12.0.13 +ENV NEXTCLOUD_VERSION 15.0.0 RUN set -ex; \ fetchDeps=" \ diff --git a/12.0/fpm/config/apcu.config.php b/15.0/fpm/config/apcu.config.php similarity index 100% rename from 12.0/fpm/config/apcu.config.php rename to 15.0/fpm/config/apcu.config.php diff --git a/12.0/fpm/config/apps.config.php b/15.0/fpm/config/apps.config.php similarity index 100% rename from 12.0/fpm/config/apps.config.php rename to 15.0/fpm/config/apps.config.php diff --git a/12.0/fpm/config/autoconfig.php b/15.0/fpm/config/autoconfig.php similarity index 100% rename from 12.0/fpm/config/autoconfig.php rename to 15.0/fpm/config/autoconfig.php diff --git a/12.0/fpm/cron.sh b/15.0/fpm/cron.sh similarity index 100% rename from 12.0/fpm/cron.sh rename to 15.0/fpm/cron.sh diff --git a/12.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh similarity index 100% rename from 12.0/fpm/entrypoint.sh rename to 15.0/fpm/entrypoint.sh diff --git a/12.0/fpm/upgrade.exclude b/15.0/fpm/upgrade.exclude similarity index 100% rename from 12.0/fpm/upgrade.exclude rename to 15.0/fpm/upgrade.exclude diff --git a/update.sh b/update.sh index 842dc659..aa791d5d 100755 --- a/update.sh +++ b/update.sh @@ -36,7 +36,7 @@ variants=( fpm-alpine ) -min_version='12.0' +min_version='13.0' # version_greater_or_equal A B returns whether A >= B function version_greater_or_equal() {