From 57d13b7affcfcf4db82fac8a40875fd998e6ddc6 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Thu, 3 Jan 2019 20:49:31 +0100 Subject: [PATCH] Change 2018.12-rc to 2019.01-rc --- .travis.yml | 18 +++++++++--------- {2018.12-rc => 2019.01-rc}/apache/Dockerfile | 4 ++-- {2018.12-rc => 2019.01-rc}/apache/cron.sh | 0 .../apache/entrypoint.sh | 0 .../apache/upgrade.exclude | 0 .../fpm-alpine/Dockerfile | 4 ++-- {2018.12-rc => 2019.01-rc}/fpm-alpine/cron.sh | 0 .../fpm-alpine/entrypoint.sh | 0 .../fpm-alpine/upgrade.exclude | 0 {2018.12-rc => 2019.01-rc}/fpm/Dockerfile | 4 ++-- {2018.12-rc => 2019.01-rc}/fpm/cron.sh | 0 {2018.12-rc => 2019.01-rc}/fpm/entrypoint.sh | 0 {2018.12-rc => 2019.01-rc}/fpm/upgrade.exclude | 0 update.sh | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) rename {2018.12-rc => 2019.01-rc}/apache/Dockerfile (97%) rename {2018.12-rc => 2019.01-rc}/apache/cron.sh (100%) rename {2018.12-rc => 2019.01-rc}/apache/entrypoint.sh (100%) rename {2018.12-rc => 2019.01-rc}/apache/upgrade.exclude (100%) rename {2018.12-rc => 2019.01-rc}/fpm-alpine/Dockerfile (97%) rename {2018.12-rc => 2019.01-rc}/fpm-alpine/cron.sh (100%) rename {2018.12-rc => 2019.01-rc}/fpm-alpine/entrypoint.sh (100%) rename {2018.12-rc => 2019.01-rc}/fpm-alpine/upgrade.exclude (100%) rename {2018.12-rc => 2019.01-rc}/fpm/Dockerfile (97%) rename {2018.12-rc => 2019.01-rc}/fpm/cron.sh (100%) rename {2018.12-rc => 2019.01-rc}/fpm/entrypoint.sh (100%) rename {2018.12-rc => 2019.01-rc}/fpm/upgrade.exclude (100%) diff --git a/.travis.yml b/.travis.yml index 4f3874f..a0a3a59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,9 +59,9 @@ jobs: - env: VERSION=2018.12-dev VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=2018.12-dev VARIANT=fpm ARCH=amd64 - env: VERSION=2018.12-dev VARIANT=apache ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=fpm ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=apache ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=apache ARCH=amd64 - stage: test images (full) env: VERSION=2018.09 VARIANT=fpm-alpine ARCH=amd64 @@ -76,12 +76,12 @@ jobs: - env: VERSION=2018.12-dev VARIANT=fpm ARCH=i386 - env: VERSION=2018.12-dev VARIANT=apache ARCH=amd64 - env: VERSION=2018.12-dev VARIANT=apache ARCH=i386 - - env: VERSION=2018.12-rc VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=2018.12-rc VARIANT=fpm ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=fpm ARCH=i386 - - env: VERSION=2018.12-rc VARIANT=apache ARCH=amd64 - - env: VERSION=2018.12-rc VARIANT=apache ARCH=i386 + - env: VERSION=2019.01-rc VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=2019.01-rc VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=fpm ARCH=i386 + - env: VERSION=2019.01-rc VARIANT=apache ARCH=amd64 + - env: VERSION=2019.01-rc VARIANT=apache ARCH=i386 - stage: deploy env: SCRIPT=build_and_push.sh diff --git a/2018.12-rc/apache/Dockerfile b/2019.01-rc/apache/Dockerfile similarity index 97% rename from 2018.12-rc/apache/Dockerfile rename to 2019.01-rc/apache/Dockerfile index d504c42..4fa2445 100644 --- a/2018.12-rc/apache/Dockerfile +++ b/2019.01-rc/apache/Dockerfile @@ -106,8 +106,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2018.12-rc -ENV FRIENDICA_ADDONS 2018.12-rc +ENV FRIENDICA_VERSION 2019.01-rc +ENV FRIENDICA_ADDONS 2019.01-rc ENTRYPOINT ["/entrypoint.sh"] diff --git a/2018.12-rc/apache/cron.sh b/2019.01-rc/apache/cron.sh similarity index 100% rename from 2018.12-rc/apache/cron.sh rename to 2019.01-rc/apache/cron.sh diff --git a/2018.12-rc/apache/entrypoint.sh b/2019.01-rc/apache/entrypoint.sh similarity index 100% rename from 2018.12-rc/apache/entrypoint.sh rename to 2019.01-rc/apache/entrypoint.sh diff --git a/2018.12-rc/apache/upgrade.exclude b/2019.01-rc/apache/upgrade.exclude similarity index 100% rename from 2018.12-rc/apache/upgrade.exclude rename to 2019.01-rc/apache/upgrade.exclude diff --git a/2018.12-rc/fpm-alpine/Dockerfile b/2019.01-rc/fpm-alpine/Dockerfile similarity index 97% rename from 2018.12-rc/fpm-alpine/Dockerfile rename to 2019.01-rc/fpm-alpine/Dockerfile index 6c6963e..e59fa73 100644 --- a/2018.12-rc/fpm-alpine/Dockerfile +++ b/2019.01-rc/fpm-alpine/Dockerfile @@ -89,8 +89,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2018.12-rc -ENV FRIENDICA_ADDONS 2018.12-rc +ENV FRIENDICA_VERSION 2019.01-rc +ENV FRIENDICA_ADDONS 2019.01-rc ENTRYPOINT ["/entrypoint.sh"] diff --git a/2018.12-rc/fpm-alpine/cron.sh b/2019.01-rc/fpm-alpine/cron.sh similarity index 100% rename from 2018.12-rc/fpm-alpine/cron.sh rename to 2019.01-rc/fpm-alpine/cron.sh diff --git a/2018.12-rc/fpm-alpine/entrypoint.sh b/2019.01-rc/fpm-alpine/entrypoint.sh similarity index 100% rename from 2018.12-rc/fpm-alpine/entrypoint.sh rename to 2019.01-rc/fpm-alpine/entrypoint.sh diff --git a/2018.12-rc/fpm-alpine/upgrade.exclude b/2019.01-rc/fpm-alpine/upgrade.exclude similarity index 100% rename from 2018.12-rc/fpm-alpine/upgrade.exclude rename to 2019.01-rc/fpm-alpine/upgrade.exclude diff --git a/2018.12-rc/fpm/Dockerfile b/2019.01-rc/fpm/Dockerfile similarity index 97% rename from 2018.12-rc/fpm/Dockerfile rename to 2019.01-rc/fpm/Dockerfile index 9106ac8..3ccc575 100644 --- a/2018.12-rc/fpm/Dockerfile +++ b/2019.01-rc/fpm/Dockerfile @@ -98,8 +98,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2018.12-rc -ENV FRIENDICA_ADDONS 2018.12-rc +ENV FRIENDICA_VERSION 2019.01-rc +ENV FRIENDICA_ADDONS 2019.01-rc ENTRYPOINT ["/entrypoint.sh"] diff --git a/2018.12-rc/fpm/cron.sh b/2019.01-rc/fpm/cron.sh similarity index 100% rename from 2018.12-rc/fpm/cron.sh rename to 2019.01-rc/fpm/cron.sh diff --git a/2018.12-rc/fpm/entrypoint.sh b/2019.01-rc/fpm/entrypoint.sh similarity index 100% rename from 2018.12-rc/fpm/entrypoint.sh rename to 2019.01-rc/fpm/entrypoint.sh diff --git a/2018.12-rc/fpm/upgrade.exclude b/2019.01-rc/fpm/upgrade.exclude similarity index 100% rename from 2018.12-rc/fpm/upgrade.exclude rename to 2019.01-rc/fpm/upgrade.exclude diff --git a/update.sh b/update.sh index 08048b5..e7b0296 100755 --- a/update.sh +++ b/update.sh @@ -41,7 +41,7 @@ variants=( ) versions=( - 2018.12-rc + 2019.01-rc 2018.12-dev 2018.09 )