From 06efefd798e21bfc82dc806e8a1002b0b6d4f51f Mon Sep 17 00:00:00 2001 From: Loic PORTE Date: Mon, 6 Jan 2020 11:18:32 +0100 Subject: [PATCH] Update terraform version --- Dockerfile | 2 +- build-docker.sh | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100755 build-docker.sh diff --git a/Dockerfile b/Dockerfile index f604489..a69476e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN apk -U add \ openssh-client && \ rm -rf /var/cache/apk/* -ARG terraform_version +ARG terraform_version=0.12.18 RUN wget -q https://releases.hashicorp.com/terraform/${terraform_version}/terraform_${terraform_version}_linux_amd64.zip -O terraform.zip && \ unzip terraform.zip -d /bin && \ rm -f terraform.zip diff --git a/build-docker.sh b/build-docker.sh deleted file mode 100755 index b6e0709..0000000 --- a/build-docker.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -set -e - -tag=$1 - -if [ -z $tag ]; then - echo "please provide a tag arg" - exit 1 -fi - -major=$(echo $tag | awk -F. '{print $1}') -minor=$(echo $tag | awk -F. '{print $2}') - -tf_ver="0.12.16" - -echo "Confirm building images for:" -echo " MAJOR: ${major}" -echo " MINOR: ${minor}" -echo " TF_VERSION: ${tf_ver}" - -read -p "Proceed? [Y/N] " ans - -if [[ "$ans" != "Y" && "$ans" != "y" ]]; then - echo "Cancelling" - exit 0 -fi - -set -x -docker build -t jmccann/drone-terraform:latest --build-arg terraform_version=${tf_ver} . - -docker tag jmccann/drone-terraform:latest jmccann/drone-terraform:${major} -docker tag jmccann/drone-terraform:latest jmccann/drone-terraform:${major}.${minor} -docker tag jmccann/drone-terraform:latest jmccann/drone-terraform:${major}.${minor}-${tf_ver} - -docker push jmccann/drone-terraform:latest -docker push jmccann/drone-terraform:${major} -docker push jmccann/drone-terraform:${major}.${minor} -docker push jmccann/drone-terraform:${major}.${minor}-${tf_ver} -set +x