Skip to content

Commit

Permalink
Merge branch 'ugprade-terraform'
Browse files Browse the repository at this point in the history
  • Loading branch information
paulRbr committed May 24, 2019
2 parents c994dfc + 10b0276 commit dc3397f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hashicorp/terraform:0.11.13
FROM hashicorp/terraform:0.12.0

RUN \
apk add --no-cache make bash ca-certificates jq curl ruby ruby-json;\
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ------------------
# TERRAFORM-MAKEFILE
# v0.11.13
# v0.12.0
# ------------------
#
# Terraform makefile is a helper to run terraform commands
Expand Down Expand Up @@ -29,7 +29,7 @@
##
# TERRAFORM INSTALL
##
version ?= "0.11.13"
version ?= "0.12.0"
os ?= $(shell uname|tr A-Z a-z)
ifeq ($(shell uname -m),x86_64)
arch ?= "amd64"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ List of commands made available

~~~bash
> make
Terraform-makefile v0.11.13
Terraform-makefile v0.12.0

console Console infra resources
destroy Destroy resources
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.13
0.12.0
2 changes: 1 addition & 1 deletion terraform.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ------------------
# TERRAFORM-MAKEFILE
# v0.11.13
# v0.12.0
# ------------------
#
# This Makefile is maintained on Github.com.
Expand Down

0 comments on commit dc3397f

Please sign in to comment.