Skip to content

Commit b587261

Browse files
committed
go-runner: switch to debian bookworm
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
1 parent e229265 commit b587261

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

dependencies.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ dependencies:
149149
match: REVISION:\ '\d+'
150150

151151
# go-runner
152-
- name: "registry.k8s.io/build-image/go-runner (go1.21-bullseye)"
153-
version: v2.3.1-go1.21.0-bullseye.0
152+
- name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
153+
version: v2.3.1-go1.21.0-bookworm.0
154154
refPaths:
155155
- path: images/build/go-runner/variants.yaml
156156
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
157157

158-
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bullseye)"
158+
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bookworm)"
159159
version: 0
160160
refPaths:
161161
- path: images/build/go-runner/Makefile
@@ -428,8 +428,8 @@ dependencies:
428428
# - path: images/build/debian-base/variants.yaml
429429
# match: "CONFIG: 'bullseye'"
430430
# Must match distroless Debian version as well
431-
- path: images/build/go-runner/Makefile
432-
match: OS_CODENAME\ \?=\ bullseye
431+
# - path: images/build/go-runner/Makefile
432+
# match: OS_CODENAME\ \?=\ bullseye
433433
- path: images/build/go-runner/variants.yaml
434434
match: "OS_CODENAME: 'bullseye'"
435435
# TODO: revert once all images are on bookworm

images/build/go-runner/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ APP_VERSION = $(shell cat VERSION)
2020
GO_MAJOR_VERSION ?= 1.21
2121
REVISION ?= 0
2222
GO_VERSION ?= 1.21.0
23-
OS_CODENAME ?= bullseye
23+
OS_CODENAME ?= bookworm
2424

2525
# Build args
2626
DISTROLESS_REGISTRY ?= gcr.io/distroless
27-
DISTROLESS_IMAGE ?= static-debian11
27+
DISTROLESS_IMAGE ?= static-debian12
2828
BUILDER_IMAGE ?= golang:$(GO_VERSION)-$(OS_CODENAME)
2929

3030
# Configuration

images/build/go-runner/variants.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
variants:
2-
go1.21-bullseye:
3-
CONFIG: 'go1.21-bullseye'
4-
IMAGE_VERSION: 'v2.3.1-go1.21.0-bullseye.0'
2+
go1.21-bookworm:
3+
CONFIG: 'go1.21-bookworm'
4+
IMAGE_VERSION: 'v2.3.1-go1.21.0-bookworm.0'
55
GO_MAJOR_VERSION: '1.21'
6-
OS_CODENAME: 'bullseye'
6+
OS_CODENAME: 'bookworm'
77
REVISION: '0'
88
GO_VERSION: '1.21.0'
9-
DISTROLESS_IMAGE: 'static-debian11'
9+
DISTROLESS_IMAGE: 'static-debian12'
1010
go1.20-bullseye:
1111
CONFIG: 'go1.20-bullseye'
1212
IMAGE_VERSION: 'v2.3.1-go1.20.7-bullseye.0'

0 commit comments

Comments
 (0)