Merge remote-tracking branch 'up/master' into feature/TF_DATA_DIR

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1-0.11.11 (2019-01-18)
+* Update embedded TF to `0.11.11`
+
 ## 5.1-0.11.8 (2018-10-11)
 * Update embedded TF to `0.11.8`
 

Dockerfile

@@ -17,7 +17,7 @@ RUN apk -U add \
     openssh-client && \
     rm -rf /var/cache/apk/*
 
-ENV TERRAFORM_VERSION 0.11.8
+ENV TERRAFORM_VERSION 0.11.11
 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

build-docker.sh

@@ -13,6 +13,18 @@ minor=$(echo $tag | awk -F. '{print $2}')
 
 tf_ver=$(grep TERRAFORM_VERSION Dockerfile | head -n 1 | awk '{print $3}')
 
+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
+
 docker build -t jmccann/drone-terraform:latest .
 
 set -x
@@ -24,4 +36,4 @@ 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
+set +x