Skip to content

Commit d6fb589

Browse files
geroplona-agent
andcommitted
Bump Go 1.24 -> 1.26 and align Alpine to 3.23
Fixes CVE-2026-31789 (OpenSSL libcrypto3/libssl3, Alpine 3.22 ships 3.5.5-r0; 3.23 ships 3.5.6-r0) and CVE-2025-68121 (Go crypto/tls session resumption, fixed in 1.24.13 / 1.25.7 / 1.26.0-rc.3). Refs CLC-2245. Co-authored-by: Ona <no-reply@ona.com>
1 parent aa03c41 commit d6fb589

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
type: string
2828

2929
env:
30-
GO_VERSION: "1.24"
30+
GO_VERSION: "1.26"
3131
SETUP_BUILDX_VERSION: "edge"
3232
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
3333

.github/workflows/buildkit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- 'frontend/dockerfile/docs/**'
2020

2121
env:
22-
GO_VERSION: "1.24"
22+
GO_VERSION: "1.26"
2323
SETUP_BUILDX_VERSION: "edge"
2424
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
2525
IMAGE_NAME: "ghcr.io/gitpod-io/buildkit"

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ARG AZURITE_VERSION=3.33.0
1818
ARG GOTESTSUM_VERSION=v1.9.0
1919
ARG DELVE_VERSION=v1.23.1
2020

21-
ARG GO_VERSION=1.24
22-
ARG ALPINE_VERSION=3.22
21+
ARG GO_VERSION=1.26
22+
ARG ALPINE_VERSION=3.23
2323
ARG XX_VERSION=1.6.1
2424
ARG BUILDKIT_DEBUG
2525
ARG EXPORT_BASE=alpine

frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile-upstream:master
22

3-
ARG GO_VERSION=1.24
4-
ARG ALPINE_VERSION=3.22
3+
ARG GO_VERSION=1.26
4+
ARG ALPINE_VERSION=3.23
55
ARG XX_VERSION=1.6.1
66

77
# xx is a helper for cross-compilation

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/moby/buildkit
22

33
go 1.24.0
44

5-
toolchain go1.24.4
5+
toolchain go1.26.2
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0

0 commit comments

Comments
 (0)