From 9bb02532903e1f9f7262762e667c6a4d6db13bbe Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Sun, 14 May 2023 15:37:50 -0500 Subject: [PATCH] chore: update various dependencies (#7503) This will help us pass the security scanners. --- provisioner/terraform/install.go | 4 ++-- scripts/Dockerfile.base | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index fc6dbbcf80..c1ba27fc0f 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -19,10 +19,10 @@ var ( // TerraformVersion is the version of Terraform used internally // when Terraform is not available on the system. // NOTE: Keep this in sync with the version in scripts/Dockerfile.base. - TerraformVersion = version.Must(version.NewVersion("1.3.4")) + TerraformVersion = version.Must(version.NewVersion("1.4.6")) minTerraformVersion = version.Must(version.NewVersion("1.1.0")) - maxTerraformVersion = version.Must(version.NewVersion("1.3.9")) + maxTerraformVersion = version.Must(version.NewVersion("1.4.9")) terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.") ) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 6dd3daea40..b89019e9c9 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -1,7 +1,7 @@ # This is the base image used for Coder images. It's a multi-arch image that is # built in depot.dev for all supported architectures. Since it's built on real # hardware and not cross-compiled, it can have "RUN" commands. -FROM alpine:latest +FROM alpine:3.18 # We use a single RUN command to reduce the number of layers in the image. # NOTE: Keep the Terraform version in sync with minTerraformVersion and @@ -12,7 +12,7 @@ RUN apk add --no-cache \ bash \ git \ openssh-client \ - terraform=1.3.4-r4 && \ + terraform=1.4.6-r1 && \ addgroup \ -g 1000 \ coder && \