From 527e0b7d3a964d75bf2c145b78f2cc35349310eb Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Mon, 29 Apr 2019 07:47:38 +0200 Subject: [PATCH] Hotfix 2019.04 --- .travis.yml | 18 +++++++++--------- {2019.03 => 2019.04}/apache/Dockerfile | 4 ++-- {2019.03 => 2019.04}/apache/cron.sh | 0 {2019.03 => 2019.04}/apache/entrypoint.sh | 0 {2019.03 => 2019.04}/apache/upgrade.exclude | 0 {2019.03 => 2019.04}/fpm-alpine/Dockerfile | 4 ++-- {2019.03 => 2019.04}/fpm-alpine/cron.sh | 0 {2019.03 => 2019.04}/fpm-alpine/entrypoint.sh | 0 .../fpm-alpine/upgrade.exclude | 0 {2019.03 => 2019.04}/fpm/Dockerfile | 4 ++-- {2019.03 => 2019.04}/fpm/cron.sh | 0 {2019.03 => 2019.04}/fpm/entrypoint.sh | 0 {2019.03 => 2019.04}/fpm/upgrade.exclude | 0 generate-stackbrew-library.sh | 6 +++--- update.sh | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) rename {2019.03 => 2019.04}/apache/Dockerfile (98%) rename {2019.03 => 2019.04}/apache/cron.sh (100%) rename {2019.03 => 2019.04}/apache/entrypoint.sh (100%) rename {2019.03 => 2019.04}/apache/upgrade.exclude (100%) rename {2019.03 => 2019.04}/fpm-alpine/Dockerfile (98%) rename {2019.03 => 2019.04}/fpm-alpine/cron.sh (100%) rename {2019.03 => 2019.04}/fpm-alpine/entrypoint.sh (100%) rename {2019.03 => 2019.04}/fpm-alpine/upgrade.exclude (100%) rename {2019.03 => 2019.04}/fpm/Dockerfile (98%) rename {2019.03 => 2019.04}/fpm/cron.sh (100%) rename {2019.03 => 2019.04}/fpm/entrypoint.sh (100%) rename {2019.03 => 2019.04}/fpm/upgrade.exclude (100%) diff --git a/.travis.yml b/.travis.yml index eaa9f7e..57477ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,20 +53,20 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images (amd64) - env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=2019.03 VARIANT=fpm ARCH=amd64 - - env: VERSION=2019.03 VARIANT=apache ARCH=amd64 + env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.04 VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.04 VARIANT=apache ARCH=amd64 - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=2019.06-dev VARIANT=fpm ARCH=amd64 - env: VERSION=2019.06-dev VARIANT=apache ARCH=amd64 - stage: test images (full) - env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=2019.03 VARIANT=fpm ARCH=amd64 - - env: VERSION=2019.03 VARIANT=fpm ARCH=i386 - - env: VERSION=2019.03 VARIANT=apache ARCH=amd64 - - env: VERSION=2019.03 VARIANT=apache ARCH=i386 + env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=2019.04 VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.04 VARIANT=fpm ARCH=i386 + - env: VERSION=2019.04 VARIANT=apache ARCH=amd64 + - env: VERSION=2019.04 VARIANT=apache ARCH=i386 - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=i386 - env: VERSION=2019.06-dev VARIANT=fpm ARCH=amd64 diff --git a/2019.03/apache/Dockerfile b/2019.04/apache/Dockerfile similarity index 98% rename from 2019.03/apache/Dockerfile rename to 2019.04/apache/Dockerfile index 14893c4..d8a6fc5 100644 --- a/2019.03/apache/Dockerfile +++ b/2019.04/apache/Dockerfile @@ -106,8 +106,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2019.03 -ENV FRIENDICA_ADDONS 2019.03 +ENV FRIENDICA_VERSION 2019.04 +ENV FRIENDICA_ADDONS 2019.04 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ diff --git a/2019.03/apache/cron.sh b/2019.04/apache/cron.sh similarity index 100% rename from 2019.03/apache/cron.sh rename to 2019.04/apache/cron.sh diff --git a/2019.03/apache/entrypoint.sh b/2019.04/apache/entrypoint.sh similarity index 100% rename from 2019.03/apache/entrypoint.sh rename to 2019.04/apache/entrypoint.sh diff --git a/2019.03/apache/upgrade.exclude b/2019.04/apache/upgrade.exclude similarity index 100% rename from 2019.03/apache/upgrade.exclude rename to 2019.04/apache/upgrade.exclude diff --git a/2019.03/fpm-alpine/Dockerfile b/2019.04/fpm-alpine/Dockerfile similarity index 98% rename from 2019.03/fpm-alpine/Dockerfile rename to 2019.04/fpm-alpine/Dockerfile index 3734aa6..4dbda59 100644 --- a/2019.03/fpm-alpine/Dockerfile +++ b/2019.04/fpm-alpine/Dockerfile @@ -89,8 +89,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2019.03 -ENV FRIENDICA_ADDONS 2019.03 +ENV FRIENDICA_VERSION 2019.04 +ENV FRIENDICA_ADDONS 2019.04 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ diff --git a/2019.03/fpm-alpine/cron.sh b/2019.04/fpm-alpine/cron.sh similarity index 100% rename from 2019.03/fpm-alpine/cron.sh rename to 2019.04/fpm-alpine/cron.sh diff --git a/2019.03/fpm-alpine/entrypoint.sh b/2019.04/fpm-alpine/entrypoint.sh similarity index 100% rename from 2019.03/fpm-alpine/entrypoint.sh rename to 2019.04/fpm-alpine/entrypoint.sh diff --git a/2019.03/fpm-alpine/upgrade.exclude b/2019.04/fpm-alpine/upgrade.exclude similarity index 100% rename from 2019.03/fpm-alpine/upgrade.exclude rename to 2019.04/fpm-alpine/upgrade.exclude diff --git a/2019.03/fpm/Dockerfile b/2019.04/fpm/Dockerfile similarity index 98% rename from 2019.03/fpm/Dockerfile rename to 2019.04/fpm/Dockerfile index 734e107..a8dc36e 100644 --- a/2019.03/fpm/Dockerfile +++ b/2019.04/fpm/Dockerfile @@ -98,8 +98,8 @@ RUN {\ COPY *.sh upgrade.exclude / RUN chmod +x /*.sh -ENV FRIENDICA_VERSION 2019.03 -ENV FRIENDICA_ADDONS 2019.03 +ENV FRIENDICA_VERSION 2019.04 +ENV FRIENDICA_ADDONS 2019.04 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ diff --git a/2019.03/fpm/cron.sh b/2019.04/fpm/cron.sh similarity index 100% rename from 2019.03/fpm/cron.sh rename to 2019.04/fpm/cron.sh diff --git a/2019.03/fpm/entrypoint.sh b/2019.04/fpm/entrypoint.sh similarity index 100% rename from 2019.03/fpm/entrypoint.sh rename to 2019.04/fpm/entrypoint.sh diff --git a/2019.03/fpm/upgrade.exclude b/2019.04/fpm/upgrade.exclude similarity index 100% rename from 2019.03/fpm/upgrade.exclude rename to 2019.04/fpm/upgrade.exclude diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c00ea8f..cf85534 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,9 +2,9 @@ set -Eeuo pipefail declare -A release_channel=( - [production]='2019.03' - [stable]='2019.03' - [latest]='2019.03' + [production]='2019.04' + [stable]='2019.04' + [latest]='2019.04' ) self="$(basename "$BASH_SOURCE")" diff --git a/update.sh b/update.sh index ffb1bfb..37c7b21 100755 --- a/update.sh +++ b/update.sh @@ -42,7 +42,7 @@ variants=( versions=( 2019.06-dev - 2019.03 + 2019.04 ) travisEnv=