From 8ed83d881d5a5fa5c64dbdbafca2df9ce8ec599c Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 16 Jun 2022 20:02:50 -0400 Subject: [PATCH] deps: terraform 1.2.3, conftest 0.32.1 (#2328) * deps: terraform 1.2.3 Signed-off-by: Rui Chen * deps: conftest 0.32.1 Signed-off-by: Rui Chen --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.dev | 2 +- testdrive/utils.go | 2 +- testing/Dockerfile | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e12a52254..a42bd52634 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.2.0 + TERRAFORM_VERSION: 1.2.3 steps: - checkout - run: make build-service diff --git a/Dockerfile b/Dockerfile index f747b6d9e5..4d6de637f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM ghcr.io/runatlantis/atlantis-base:2022.05.13 AS base ARG TARGETPLATFORM # install terraform binaries -ENV DEFAULT_TERRAFORM_VERSION=1.2.0 +ENV DEFAULT_TERRAFORM_VERSION=1.2.3 # 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 1.1.9 ${DEFAULT_TERRAFORM_VERSION}" && \ @@ -35,7 +35,7 @@ RUN AVAILABLE_TERRAFORM_VERSIONS="0.11.15 0.12.31 0.13.7 0.14.11 0.15.5 1.0.11 1 done && \ ln -s /usr/local/bin/tf/versions/${DEFAULT_TERRAFORM_VERSION}/terraform /usr/local/bin/terraform -ENV DEFAULT_CONFTEST_VERSION=0.31.0 +ENV DEFAULT_CONFTEST_VERSION=0.32.1 RUN AVAILABLE_CONFTEST_VERSIONS="${DEFAULT_CONFTEST_VERSION}" && \ case ${TARGETPLATFORM} in \ diff --git a/Dockerfile.dev b/Dockerfile.dev index c968530862..1d0be5817b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,6 +1,6 @@ FROM ghcr.io/runatlantis/atlantis:latest COPY atlantis /usr/local/bin/atlantis # TODO: remove this once we get this in the base image -ENV DEFAULT_CONFTEST_VERSION=0.31.0 +ENV DEFAULT_CONFTEST_VERSION=0.32.1 WORKDIR /atlantis/src diff --git a/testdrive/utils.go b/testdrive/utils.go index 3e7503cbbc..9c809cfc82 100644 --- a/testdrive/utils.go +++ b/testdrive/utils.go @@ -34,7 +34,7 @@ import ( ) const hashicorpReleasesURL = "https://releases.hashicorp.com" -const terraformVersion = "1.2.0" +const terraformVersion = "1.2.3" 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 7e5a70f7eb..3517c534bc 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.2.0 +ENV TERRAFORM_VERSION=1.2.3 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} && \ @@ -12,7 +12,7 @@ RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH rm terraform.zip # Install conftest -ENV CONFTEST_VERSION=0.31.0 +ENV CONFTEST_VERSION=0.32.1 RUN case $(uname -m) in x86_64|amd64) ARCH="x86_64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \ curl -LOs https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_${ARCH}.tar.gz && \ curl -LOs https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/checksums.txt && \