diff --git a/.docker-files/entrypoint.sh b/.docker-files/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/.docker-files/entrypoint.sh +++ b/.docker-files/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/.travis.yml b/.travis.yml index 63e6d70..3790f37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,9 @@ jobs: - env: VERSION=2019.03-dev VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=fpm ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=apache ARCH=amd64 - stage: test images (full) env: VERSION=2019.01 VARIANT=fpm-alpine ARCH=amd64 @@ -73,6 +76,12 @@ jobs: - env: VERSION=2019.03-dev VARIANT=fpm ARCH=i386 - env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=apache ARCH=i386 + - env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=2019.03-RC VARIANT=fpm ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=fpm ARCH=i386 + - env: VERSION=2019.03-RC VARIANT=apache ARCH=amd64 + - env: VERSION=2019.03-RC VARIANT=apache ARCH=i386 - stage: deploy env: SCRIPT=build_and_push.sh diff --git a/2019.01/apache/entrypoint.sh b/2019.01/apache/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.01/apache/entrypoint.sh +++ b/2019.01/apache/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/2019.01/fpm-alpine/entrypoint.sh b/2019.01/fpm-alpine/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.01/fpm-alpine/entrypoint.sh +++ b/2019.01/fpm-alpine/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/2019.01/fpm/entrypoint.sh b/2019.01/fpm/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.01/fpm/entrypoint.sh +++ b/2019.01/fpm/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/2019.03-dev/apache/entrypoint.sh b/2019.03-dev/apache/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.03-dev/apache/entrypoint.sh +++ b/2019.03-dev/apache/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/2019.03-dev/fpm-alpine/entrypoint.sh b/2019.03-dev/fpm-alpine/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.03-dev/fpm-alpine/entrypoint.sh +++ b/2019.03-dev/fpm-alpine/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/2019.03-dev/fpm/entrypoint.sh b/2019.03-dev/fpm/entrypoint.sh index c0c86e2..0ef8955 100644 --- a/2019.03-dev/fpm/entrypoint.sh +++ b/2019.03-dev/fpm/entrypoint.sh @@ -20,11 +20,11 @@ clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - if echo "$friendica_git" | grep -Eq '^.*\-dev'; then + if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" fi - if echo "$addons_git" | grep -Eq '^.*\-dev'; then + if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then addons_git="develop" fi diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d40ee6a..74b5978 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A release_channel=( - [production]='2018.01' + [production]='2019.01' [stable]='2019.01' [latest]='2019.01' ) diff --git a/update.sh b/update.sh index f8b4be0..e4b864c 100755 --- a/update.sh +++ b/update.sh @@ -41,6 +41,7 @@ variants=( ) versions=( + 2019.03-RC 2019.03-dev 2019.01 ) @@ -60,7 +61,7 @@ function create_variant() { # Check which installation typ we need. If develop, the source will get downloaded by git. install_type='stable' - if [[ "$1" == *-dev ]] || [[ "$1" == *-rc ]]; then + if [[ "${1,,}" == *-dev ]] || [[ "${1,,}" == *-rc ]]; then install_type='develop' fi