Skip to content

Commit

Permalink
Merge pull request #218 from wking/terraform-0.11.8
Browse files Browse the repository at this point in the history
Bump Terraform from 0.11.7 to 0.11.8
  • Loading branch information
openshift-merge-robot authored Sep 17, 2018
2 parents a6f7f67 + 856350d commit a6fbe17
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
workspace(name = "installer")

terrafom_version = "0.11.7"
terrafom_version = "0.11.8"

supported_platforms = [
"linux",
Expand Down
4 changes: 2 additions & 2 deletions hack/tf-fmt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if [ "$IS_CONTAINER" != "" ]; then
set -- -list -check -write=false
fi
set -x
/terraform fmt "${@}"
/terraform fmt "${@}" # FIXME: drop this slash after we update openshift/release
else
podman run --rm \
--env IS_CONTAINER=TRUE \
--volume "${PWD}:${PWD}:z" \
--workdir "${PWD}" \
quay.io/coreos/terraform-alpine:v0.11.7 \
quay.io/coreos/terraform-alpine:v0.11.8 \
./hack/tf-fmt.sh
fi
2 changes: 1 addition & 1 deletion images/tectonic-installer/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM openshift/origin-release:golang-1.10 as build
WORKDIR /go/src/github.com/openshift/installer
COPY . .
### Install Terraform
ENV TERRAFORM_VERSION="0.11.1"
ENV TERRAFORM_VERSION="0.11.8"
ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip

RUN go build -o ./installer/tectonic ./installer/cmd/tectonic && \
Expand Down

0 comments on commit a6fbe17

Please sign in to comment.