From c2d7b3ff2b878d9555338b465021db0c2c651d50 Mon Sep 17 00:00:00 2001 From: Daniel Andrade Date: Fri, 5 Aug 2022 21:13:24 -0300 Subject: [PATCH] fix: add terraform-tools to the docker images (#186) * add terraform-tools to the docker images * use a single apt-get transaction --- examples/tf_cloudbuild_builder_simple/Dockerfile | 2 +- modules/cloudbuild/cloudbuild_builder/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tf_cloudbuild_builder_simple/Dockerfile b/examples/tf_cloudbuild_builder_simple/Dockerfile index 2784db45..b4d08f6c 100644 --- a/examples/tf_cloudbuild_builder_simple/Dockerfile +++ b/examples/tf_cloudbuild_builder_simple/Dockerfile @@ -20,7 +20,7 @@ ARG TERRAFORM_VERSION=1.1.0 ENV ENV_TERRAFORM_VERSION=$TERRAFORM_VERSION RUN apt-get update && \ - /builder/google-cloud-sdk/bin/gcloud -q components install alpha beta && \ + /builder/google-cloud-sdk/bin/gcloud -q components install alpha beta terraform-tools && \ apt-get -y install curl jq unzip git ca-certificates gnupg && \ curl https://releases.hashicorp.com/terraform/${ENV_TERRAFORM_VERSION}/terraform_${ENV_TERRAFORM_VERSION}_linux_amd64.zip --output terraform_${ENV_TERRAFORM_VERSION}_linux_amd64.zip && \ curl https://releases.hashicorp.com/terraform/${ENV_TERRAFORM_VERSION}/terraform_${ENV_TERRAFORM_VERSION}_SHA256SUMS.sig --output terraform_SHA256SUMS.sig && \ diff --git a/modules/cloudbuild/cloudbuild_builder/Dockerfile b/modules/cloudbuild/cloudbuild_builder/Dockerfile index af0efaae..5e23ca20 100644 --- a/modules/cloudbuild/cloudbuild_builder/Dockerfile +++ b/modules/cloudbuild/cloudbuild_builder/Dockerfile @@ -23,7 +23,7 @@ ENV ENV_TERRAFORM_VERSION=$TERRAFORM_VERSION ENV ENV_TERRAFORM_VERSION_SHA256SUM=$TERRAFORM_VERSION_SHA256SUM RUN apt-get update && \ - apt-get -y install curl jq unzip git ca-certificates && \ + apt-get -y install curl jq unzip git ca-certificates google-cloud-sdk-terraform-tools && \ curl https://releases.hashicorp.com/terraform/${ENV_TERRAFORM_VERSION}/terraform_${ENV_TERRAFORM_VERSION}_linux_amd64.zip \ > terraform_linux_amd64.zip && \ echo "${ENV_TERRAFORM_VERSION_SHA256SUM} terraform_linux_amd64.zip" > terraform_SHA256SUMS && \