From 21c7e37f3ea364993d9cd45ef656907f9033d083 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 30 May 2024 09:26:10 +0100 Subject: [PATCH 1/2] Revert "chore: bump alpine from 3.19.1 to 3.20.0 in /scripts (#13375)" This reverts commit 5b78ec97b601027fdba5a55ff70e612bc3103185. --- scripts/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 9537c9ca1de78..99af24807525b 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:3.20.0 +FROM alpine:3.19.1 # 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 From 18f9f25a1044aa82203e955c20122da845970aa6 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 30 May 2024 09:37:47 +0100 Subject: [PATCH 2/2] Revert "Upgrade to git v2.45.1 to fix alpine 3.20 builds (#13411)" This reverts commit a1671a633ced7b58e779f3dcc927f14fc7398de9. --- scripts/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 99af24807525b..fa249f6a62cf9 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -10,7 +10,7 @@ RUN apk add --no-cache \ curl \ wget \ bash \ - git=2.45.1-r0 \ + git=2.43.4-r0 \ openssl \ openssh-client && \ addgroup \