From e49233a63f5ffb1cba15b8bf6d45320d80e6424f Mon Sep 17 00:00:00 2001 From: Xu Wang Date: Wed, 19 Jul 2017 12:09:21 -0700 Subject: [PATCH] separate TF_VERSION and TF_REQUIRED_VERSION, so we can use hashicorp/terraform:light image. --- route53/Makefile | 2 +- route53/scripts/gen-provider.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/route53/Makefile b/route53/Makefile index edf8919..e0f9fab 100644 --- a/route53/Makefile +++ b/route53/Makefile @@ -20,7 +20,7 @@ TF_VAR_timestamp := $(shell date +%Y-%m-%d-%H%M) # Terraform dir referenced in container TF_VAR_build_dir := /build -TF_VERSION := 0.9.3 +TF_VERSION := light TF_IMAGE := hashicorp/terraform:${TF_VERSION} TF_CMD := docker run -it --rm --env-file=${BUILD_DIR}/tf.env \ -v=${HOME}/.aws:/root/.aws \ diff --git a/route53/scripts/gen-provider.sh b/route53/scripts/gen-provider.sh index 3178c8a..d565de2 100755 --- a/route53/scripts/gen-provider.sh +++ b/route53/scripts/gen-provider.sh @@ -7,8 +7,8 @@ TF_REMOTE_STATE_BUCKET=${TF_REMOTE_STATE_BUCKET%%\"} TF_REMOTE_STATE_BUCKET=${TF_REMOTE_STATE_BUCKET##\"} TF_REMOTE_STATE_PATH=${TF_REMOTE_STATE_PATH%%\"} TF_REMOTE_STATE_PATH=${TF_REMOTE_STATE_PATH##\"} -TF_VERSION=${TF_VERSION%%\"} -TF_VERSION=${TF_VERSION##\"} +TF_REQUIRED_VERSION=${TF_REQUIRED_VERSION%%\"} +TF_REQUIRED_VERSION=${TF_REQUIRED_VERSION##\"} TF_REMOTE_STATE_REGION=${TF_REMOTE_STATE_REGION%%\"} TF_REMOTE_STATE_REGION=${TF_REMOTE_STATE_REGION##\"} AWS_PROFILE=${AWS_PROFILE%%\"} @@ -25,7 +25,7 @@ ALLOW_SSH_CIDR="$(curl -s http://ipinfo.io/ip)/32" cat <