File tree Expand file tree Collapse file tree 3 files changed +12
-12
lines changed Expand file tree Collapse file tree 3 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -149,13 +149,13 @@ dependencies:
149
149
match : REVISION:\ '\d+'
150
150
151
151
# 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
154
154
refPaths :
155
155
- path : images/build/go-runner/variants.yaml
156
156
match : v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
157
157
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 )"
159
159
version : 0
160
160
refPaths :
161
161
- path : images/build/go-runner/Makefile
@@ -428,8 +428,8 @@ dependencies:
428
428
# - path: images/build/debian-base/variants.yaml
429
429
# match: "CONFIG: 'bullseye'"
430
430
# 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
433
433
- path : images/build/go-runner/variants.yaml
434
434
match : " OS_CODENAME: 'bullseye'"
435
435
# TODO: revert once all images are on bookworm
Original file line number Diff line number Diff line change @@ -20,11 +20,11 @@ APP_VERSION = $(shell cat VERSION)
20
20
GO_MAJOR_VERSION ?= 1.21
21
21
REVISION ?= 0
22
22
GO_VERSION ?= 1.21.0
23
- OS_CODENAME ?= bullseye
23
+ OS_CODENAME ?= bookworm
24
24
25
25
# Build args
26
26
DISTROLESS_REGISTRY ?= gcr.io/distroless
27
- DISTROLESS_IMAGE ?= static-debian11
27
+ DISTROLESS_IMAGE ?= static-debian12
28
28
BUILDER_IMAGE ?= golang:$(GO_VERSION ) -$(OS_CODENAME )
29
29
30
30
# Configuration
Original file line number Diff line number Diff line change 1
1
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'
5
5
GO_MAJOR_VERSION : ' 1.21'
6
- OS_CODENAME : ' bullseye '
6
+ OS_CODENAME : ' bookworm '
7
7
REVISION : ' 0'
8
8
GO_VERSION : ' 1.21.0'
9
- DISTROLESS_IMAGE : ' static-debian11 '
9
+ DISTROLESS_IMAGE : ' static-debian12 '
10
10
go1.20-bullseye :
11
11
CONFIG : ' go1.20-bullseye'
12
12
IMAGE_VERSION : ' v2.3.1-go1.20.7-bullseye.0'
You can’t perform that action at this time.
0 commit comments