Skip to content

Commit

Permalink
go-runner: switch to debian bookworm
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
  • Loading branch information
saschagrunert committed Aug 29, 2023
1 parent e229265 commit b587261
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ dependencies:
match: REVISION:\ '\d+'

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

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bullseye)"
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bookworm)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
Expand Down Expand Up @@ -428,8 +428,8 @@ dependencies:
# - path: images/build/debian-base/variants.yaml
# match: "CONFIG: 'bullseye'"
# Must match distroless Debian version as well
- path: images/build/go-runner/Makefile
match: OS_CODENAME\ \?=\ bullseye
# - path: images/build/go-runner/Makefile
# match: OS_CODENAME\ \?=\ bullseye
- path: images/build/go-runner/variants.yaml
match: "OS_CODENAME: 'bullseye'"
# TODO: revert once all images are on bookworm
Expand Down
4 changes: 2 additions & 2 deletions images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.21
REVISION ?= 0
GO_VERSION ?= 1.21.0
OS_CODENAME ?= bullseye
OS_CODENAME ?= bookworm

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

# Configuration
Expand Down
10 changes: 5 additions & 5 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
variants:
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.21.0-bullseye.0'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.21.0-bookworm.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.21.0'
DISTROLESS_IMAGE: 'static-debian11'
DISTROLESS_IMAGE: 'static-debian12'
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.20.7-bullseye.0'
Expand Down

0 comments on commit b587261

Please sign in to comment.