diff --git a/.travis.yml b/.travis.yml index 3790f37..66d08fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,9 +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 + - 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 @@ -76,12 +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 + - 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.03-RC/apache/Dockerfile b/2019.03-rc/apache/Dockerfile similarity index 100% rename from 2019.03-RC/apache/Dockerfile rename to 2019.03-rc/apache/Dockerfile diff --git a/2019.03-RC/apache/cron.sh b/2019.03-rc/apache/cron.sh similarity index 100% rename from 2019.03-RC/apache/cron.sh rename to 2019.03-rc/apache/cron.sh diff --git a/2019.03-RC/apache/entrypoint.sh b/2019.03-rc/apache/entrypoint.sh similarity index 100% rename from 2019.03-RC/apache/entrypoint.sh rename to 2019.03-rc/apache/entrypoint.sh diff --git a/2019.03-RC/apache/upgrade.exclude b/2019.03-rc/apache/upgrade.exclude similarity index 100% rename from 2019.03-RC/apache/upgrade.exclude rename to 2019.03-rc/apache/upgrade.exclude diff --git a/2019.03-RC/fpm-alpine/Dockerfile b/2019.03-rc/fpm-alpine/Dockerfile similarity index 100% rename from 2019.03-RC/fpm-alpine/Dockerfile rename to 2019.03-rc/fpm-alpine/Dockerfile diff --git a/2019.03-RC/fpm-alpine/cron.sh b/2019.03-rc/fpm-alpine/cron.sh similarity index 100% rename from 2019.03-RC/fpm-alpine/cron.sh rename to 2019.03-rc/fpm-alpine/cron.sh diff --git a/2019.03-RC/fpm-alpine/entrypoint.sh b/2019.03-rc/fpm-alpine/entrypoint.sh similarity index 100% rename from 2019.03-RC/fpm-alpine/entrypoint.sh rename to 2019.03-rc/fpm-alpine/entrypoint.sh diff --git a/2019.03-RC/fpm-alpine/upgrade.exclude b/2019.03-rc/fpm-alpine/upgrade.exclude similarity index 100% rename from 2019.03-RC/fpm-alpine/upgrade.exclude rename to 2019.03-rc/fpm-alpine/upgrade.exclude diff --git a/2019.03-RC/fpm/Dockerfile b/2019.03-rc/fpm/Dockerfile similarity index 100% rename from 2019.03-RC/fpm/Dockerfile rename to 2019.03-rc/fpm/Dockerfile diff --git a/2019.03-RC/fpm/cron.sh b/2019.03-rc/fpm/cron.sh similarity index 100% rename from 2019.03-RC/fpm/cron.sh rename to 2019.03-rc/fpm/cron.sh diff --git a/2019.03-RC/fpm/entrypoint.sh b/2019.03-rc/fpm/entrypoint.sh similarity index 100% rename from 2019.03-RC/fpm/entrypoint.sh rename to 2019.03-rc/fpm/entrypoint.sh diff --git a/2019.03-RC/fpm/upgrade.exclude b/2019.03-rc/fpm/upgrade.exclude similarity index 100% rename from 2019.03-RC/fpm/upgrade.exclude rename to 2019.03-rc/fpm/upgrade.exclude diff --git a/update.sh b/update.sh index 1da2b44..5941dbe 100755 --- a/update.sh +++ b/update.sh @@ -50,7 +50,8 @@ travisEnv= travisEnvAmd64= function create_variant() { - dir="$1/$variant" + dockerName=${1,,} + dir="$dockerName/$variant" # Create the version+variant directory with a Dockerfile. mkdir -p "$dir" @@ -90,9 +91,9 @@ function create_variant() { fi done - travisEnvAmd64='\n - env: VERSION='"$1"' VARIANT='"$variant"' ARCH=amd64'"$travisEnvAmd64" + travisEnvAmd64='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH=amd64'"$travisEnvAmd64" for arch in i386 amd64; do - travisEnv='\n - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" + travisEnv='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" done }