diff --git a/Dockerfile b/Dockerfile index 8173599..9a4b8fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM hashicorp/terraform:0.12.27 +FROM hashicorp/terraform:0.12.29 RUN \ apk add --no-cache make bash ca-certificates jq curl ruby ruby-json;\ diff --git a/Makefile b/Makefile index e7c1aee..e72529c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # ------------------ # TERRAFORM-MAKEFILE -# v0.12.27 +# v0.12.29 # ------------------ # # Terraform makefile is a helper to run terraform commands @@ -29,7 +29,7 @@ ## # TERRAFORM INSTALL ## -version ?= "0.12.27" +version ?= "0.12.29" os ?= $(shell uname|tr A-Z a-z) ifeq ($(shell uname -m),x86_64) arch ?= "amd64" diff --git a/README.md b/README.md index 23bdbc2..193c36b 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ List of commands made available ~~~bash > make -Terraform-makefile v0.12.27 +Terraform-makefile v0.12.29 console Console infra resources destroy Destroy resources diff --git a/VERSION b/VERSION index 84bb609..58828a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.27 +0.12.29 diff --git a/terraform.sh b/terraform.sh index 4d8d0a1..b8ef684 100755 --- a/terraform.sh +++ b/terraform.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # ------------------ # TERRAFORM-MAKEFILE -# v0.12.27 +# v0.12.29 # ------------------ # # This Makefile is maintained on Github.com. @@ -158,6 +158,11 @@ while IFS=',' read -ra providers; do declare -x "OVH_CONSUMER_KEY=${!token}" fi ;; + gandi) + if [ -z "${GANDI_SHARING_ID}" ]; then + declare -x "GANDI_SHARING_ID=${!key}" + declare -x "GANDI_KEY=${!secret}" + fi esac done