mirror of
https://github.com/coder/coder.git
synced 2026-10-16 14:48:56 +08:00
chore: bump bundled terraform to 1.16.6 (#30516)
Bump the bundled Terraform binary from 1.16.2 to 1.16.6 (latest stable, [released 2026-10-14](https://github.com/hashicorp/terraform/releases/tag/v1.16.6)), following the same file set as #29331: - `provisioner/terraform/install.go`: `TerraformVersion` (`maxTerraformVersion` stays at 1.16.9 since this is a patch bump) - `install.sh`, `scripts/Dockerfile.base` - `mise.toml`, `mise.lock` (checksums from HashiCorp's `terraform_1.16.6_SHA256SUMS`) - `flake.nix` (fetchurl SRI hashes derived from the same SHA256SUMS) - `docs/install/prepare/airgap.md`: the example Dockerfile `ARG TERRAFORM_VERSION` had drifted back to 1.11.0 after the docs move; updated to 1.16.6 Verified locally with `go test ./provisioner/terraform/ -run 'TestInstall|Version'`. Opened by Superblink on behalf of @droopy4096. _Updated from 1.16.5 to 1.16.6 (adds an HTTP/2 resource-exhaustion fix). Branch name still says 1.16.5. Fixture fingerprint (`generation.sha1`) regenerated; `go test ./provisioner/terraform/ -run 'TestInstall|Version|Golden'` passes._ --------- Co-authored-by: coder[bot] <137810501+coder[bot]@users.noreply.github.com> Co-authored-by: Dmitry Makovey <dmakovey@yahoo.com>
This commit is contained in:
co-authored by
Dmitry Makovey
parent
f25b6294b6
commit
116660193e
@@ -50,7 +50,7 @@ RUN mkdir -p /opt/terraform
|
||||
# The below step is optional if you wish to keep the existing version.
|
||||
# See ../../provisioner/terraform/install.go#L27-L28
|
||||
# for supported Terraform versions.
|
||||
ARG TERRAFORM_VERSION=1.11.0
|
||||
ARG TERRAFORM_VERSION=1.16.6
|
||||
RUN apk update && \
|
||||
curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
|
||||
&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
|
||||
|
||||
@@ -195,28 +195,28 @@
|
||||
releases = {
|
||||
x86_64-linux = {
|
||||
platform = "linux_amd64";
|
||||
hash = "sha256-DRcBHwxGZFObFksESQPQTilshsE8ufKAQAdsZc+zmFo=";
|
||||
hash = "sha256-OANLONAwljmaehJkoUVhqAKbK0lv0fFpRSZW5Tlo8bc=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
platform = "linux_arm64";
|
||||
hash = "sha256-wEC9HjEitCkPcPdCiNjFpU3dQlSj5Sop58xmZlP1Cgo=";
|
||||
hash = "sha256-p1C1oRA48WWEayZYxAyIzXBwqmemG6tDGhS6J5KOqeo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
platform = "darwin_arm64";
|
||||
hash = "sha256-fAoLMciqVBNRNpvPe2KnKJ+8Id5+V3ZprrptQvTmzEE=";
|
||||
hash = "sha256-heG8eKtFvcX4KnusOSnjfQcoNKWE0iWDokmNxnu2JM0=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
platform = "darwin_amd64";
|
||||
hash = "sha256-J19Q7Rcq8vI+FaLOfjJRqsixe3aPLmLs64HDU80Qar8=";
|
||||
hash = "sha256-eUo2w/fr9sWPIInCJgaKU50XBbo1ilZ5tRZxyNx+vHs=";
|
||||
};
|
||||
};
|
||||
target = releases.${system} or null;
|
||||
in
|
||||
if target != null then
|
||||
pkgs.runCommand "terraform-1.16.2" {
|
||||
pkgs.runCommand "terraform-1.16.6" {
|
||||
nativeBuildInputs = [ pkgs.unzip ];
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_${target.platform}.zip";
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_${target.platform}.zip";
|
||||
hash = target.hash;
|
||||
};
|
||||
} ''
|
||||
|
||||
+1
-1
@@ -276,7 +276,7 @@ EOF
|
||||
main() {
|
||||
MAINLINE=1
|
||||
STABLE=0
|
||||
TERRAFORM_VERSION="1.16.2"
|
||||
TERRAFORM_VERSION="1.16.6"
|
||||
|
||||
if [ "${TRACE-}" ]; then
|
||||
set -x
|
||||
|
||||
@@ -945,52 +945,52 @@ checksum = "sha256:7af7acb9f81bdddbc343855cb3a42e1d38ae9a1b044bfcd9b975a118d1078
|
||||
url = "https://github.com/anchore/syft/releases/download/v1.26.1/syft_1.26.1_windows_amd64.zip"
|
||||
|
||||
[[tools.terraform]]
|
||||
version = "1.16.2"
|
||||
version = "1.16.6"
|
||||
backend = "aqua:hashicorp/terraform"
|
||||
|
||||
[tools.terraform."platforms.linux-arm64"]
|
||||
checksum = "sha256:c040bd1e3122b4290f70f74288d8c5a54ddd4254a3e52a29e7cc666653f50a0a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_arm64.zip"
|
||||
checksum = "sha256:a750b5a11038f165846b2658c40c88cd7070aa67a61bab431a14ba27928ea9ea"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_arm64.zip"
|
||||
|
||||
[tools.terraform."platforms.linux-arm64-musl"]
|
||||
checksum = "sha256:c040bd1e3122b4290f70f74288d8c5a54ddd4254a3e52a29e7cc666653f50a0a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_arm64.zip"
|
||||
checksum = "sha256:a750b5a11038f165846b2658c40c88cd7070aa67a61bab431a14ba27928ea9ea"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_arm64.zip"
|
||||
|
||||
[tools.terraform."platforms.linux-x64"]
|
||||
checksum = "sha256:0d17011f0c4664539b164b044903d04e296c86c13cb9f28040076c65cfb3985a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_amd64.zip"
|
||||
checksum = "sha256:38034b38d03096399a7a1264a14561a8029b2b496fd1f169452656e53968f1b7"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.linux-x64-baseline"]
|
||||
checksum = "sha256:0d17011f0c4664539b164b044903d04e296c86c13cb9f28040076c65cfb3985a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_amd64.zip"
|
||||
checksum = "sha256:38034b38d03096399a7a1264a14561a8029b2b496fd1f169452656e53968f1b7"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.linux-x64-musl"]
|
||||
checksum = "sha256:0d17011f0c4664539b164b044903d04e296c86c13cb9f28040076c65cfb3985a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_amd64.zip"
|
||||
checksum = "sha256:38034b38d03096399a7a1264a14561a8029b2b496fd1f169452656e53968f1b7"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.linux-x64-musl-baseline"]
|
||||
checksum = "sha256:0d17011f0c4664539b164b044903d04e296c86c13cb9f28040076c65cfb3985a"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_amd64.zip"
|
||||
checksum = "sha256:38034b38d03096399a7a1264a14561a8029b2b496fd1f169452656e53968f1b7"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.macos-arm64"]
|
||||
checksum = "sha256:7c0a0b31c8aa541351369bcf7b62a7289fbc21de7e577669aeba6d42f4e6cc41"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_darwin_arm64.zip"
|
||||
checksum = "sha256:85e1bc78ab45bdc5f82a7bac3929e37d072834a584d22583a2498dc67bb624cd"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_darwin_arm64.zip"
|
||||
|
||||
[tools.terraform."platforms.macos-x64"]
|
||||
checksum = "sha256:275f50ed172af2f23e15a2ce7e3251aac8b17b768f2e62eceb81c353cd106abf"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_darwin_amd64.zip"
|
||||
checksum = "sha256:794a36c3f7ebf6c58f2089c226068a539d1705ba358a5679b51671c8dc7ebc7b"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_darwin_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.macos-x64-baseline"]
|
||||
checksum = "sha256:275f50ed172af2f23e15a2ce7e3251aac8b17b768f2e62eceb81c353cd106abf"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_darwin_amd64.zip"
|
||||
checksum = "sha256:794a36c3f7ebf6c58f2089c226068a539d1705ba358a5679b51671c8dc7ebc7b"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_darwin_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.windows-x64"]
|
||||
checksum = "sha256:6ef140ce1d399dc43b8315194176ddc2dfb5c21d607968e82ef20a55cfff40d0"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_windows_amd64.zip"
|
||||
checksum = "sha256:6ea2c186e0e76a113af30fbcdcf7a4b4c70756317994a04929e5c90b9e94b1df"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_windows_amd64.zip"
|
||||
|
||||
[tools.terraform."platforms.windows-x64-baseline"]
|
||||
checksum = "sha256:6ef140ce1d399dc43b8315194176ddc2dfb5c21d607968e82ef20a55cfff40d0"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_windows_amd64.zip"
|
||||
checksum = "sha256:6ea2c186e0e76a113af30fbcdcf7a4b4c70756317994a04929e5c90b9e94b1df"
|
||||
url = "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_windows_amd64.zip"
|
||||
|
||||
[[tools.vercel]]
|
||||
version = "54.14.0"
|
||||
|
||||
@@ -59,7 +59,7 @@ crane = "0.21.6"
|
||||
helm = "3.21.0"
|
||||
kubectx = "0.9.4"
|
||||
syft = "1.26.1"
|
||||
terraform = "1.16.2"
|
||||
terraform = "1.16.6"
|
||||
zizmor = "1.11.0"
|
||||
|
||||
# Developer-environment niceties for the dogfood image. Non-dogfood
|
||||
|
||||
@@ -22,7 +22,7 @@ var (
|
||||
// when Terraform is not available on the system.
|
||||
// NOTE: Keep this in sync with the version in scripts/Dockerfile.base.
|
||||
// NOTE: Keep this in sync with the version in install.sh.
|
||||
TerraformVersion = version.Must(version.NewVersion("1.16.2"))
|
||||
TerraformVersion = version.Must(version.NewVersion("1.16.6"))
|
||||
|
||||
minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
|
||||
maxTerraformVersion = version.Must(version.NewVersion("1.16.9")) // use .9 to automatically allow patch releases
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
426484181603169b6ab8652bc6f9fa588f823fbb
|
||||
6c0c4588ca5921519627d4c1394da76b965b0e31
|
||||
|
||||
@@ -27,7 +27,7 @@ RUN apk add --no-cache \
|
||||
# Terraform was disabled in the edge repo due to a build issue.
|
||||
# https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35
|
||||
# Using wget for now. Note that busybox unzip doesn't support streaming.
|
||||
RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; elif [ "${ARCH}" == "armv7l" ]; then ARCH="arm"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.16.2/terraform_1.16.2_linux_${ARCH}.zip" && \
|
||||
RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; elif [ "${ARCH}" == "armv7l" ]; then ARCH="arm"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.16.6/terraform_1.16.6_linux_${ARCH}.zip" && \
|
||||
busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
|
||||
rm -f /tmp/terraform.zip && \
|
||||
chmod +x /usr/local/bin/terraform && \
|
||||
|
||||
Reference in New Issue
Block a user