From a5392ee2985e2a4eb2267958dc0371c1697a33c1 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 20 May 2022 15:18:59 -0400 Subject: [PATCH] deps: terraform 1.2.0 (#2267) * deps: terraform 1.2.0 * support tf 1.1.9 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- testdrive/utils.go | 2 +- testing/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 79714e9b60..1c68a3686e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: # We do this instead of setting --default-tf-version because setting # that flag starts the download asynchronously so we'd have a race # condition. - TERRAFORM_VERSION: 1.1.9 + TERRAFORM_VERSION: 1.2.0 steps: - checkout - run: make build-service diff --git a/Dockerfile b/Dockerfile index 8af7c0fea2..f747b6d9e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,10 @@ FROM ghcr.io/runatlantis/atlantis-base:2022.05.13 AS base ARG TARGETPLATFORM # install terraform binaries -ENV DEFAULT_TERRAFORM_VERSION=1.1.9 +ENV DEFAULT_TERRAFORM_VERSION=1.2.0 # In the official Atlantis image we only have the latest of each Terraform version. -RUN AVAILABLE_TERRAFORM_VERSIONS="0.11.15 0.12.31 0.13.7 0.14.11 0.15.5 1.0.11 ${DEFAULT_TERRAFORM_VERSION}" && \ +RUN AVAILABLE_TERRAFORM_VERSIONS="0.11.15 0.12.31 0.13.7 0.14.11 0.15.5 1.0.11 1.1.9 ${DEFAULT_TERRAFORM_VERSION}" && \ case ${TARGETPLATFORM} in \ "linux/amd64") TERRAFORM_ARCH=amd64 ;; \ "linux/arm64") TERRAFORM_ARCH=arm64 ;; \ diff --git a/testdrive/utils.go b/testdrive/utils.go index 4c2f19a109..3e7503cbbc 100644 --- a/testdrive/utils.go +++ b/testdrive/utils.go @@ -34,7 +34,7 @@ import ( ) const hashicorpReleasesURL = "https://releases.hashicorp.com" -const terraformVersion = "1.1.9" +const terraformVersion = "1.2.0" const ngrokDownloadURL = "https://bin.equinox.io/c/4VmDzA7iaHb" const ngrokAPIURL = "localhost:41414" // We hope this isn't used. const atlantisPort = 4141 diff --git a/testing/Dockerfile b/testing/Dockerfile index 3363bc0c2d..7e5a70f7eb 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.17 RUN apt-get update && apt-get install unzip # Install Terraform -ENV TERRAFORM_VERSION=1.1.9 +ENV TERRAFORM_VERSION=1.2.0 RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \ wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_${ARCH}.zip && \ mkdir -p /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \