separate TF_VERSION and TF_REQUIRED_VERSION, so we can use hashicorp/…

…terraform:light image.
xuwang · Jul 19, 2017 · e49233a · e49233a
1 parent 6923039
commit e49233a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 <<EOF
 # Generated by scripts/gen-provider.sh
 terraform {
-  required_version = "${TF_VERSION}"
+  required_version = "${TF_REQUIRED_VERSION}"
   backend "s3" {
     bucket = "${TF_REMOTE_STATE_BUCKET}"
     key    = "${TF_REMOTE_STATE_PATH}"