Skip to content

Commit

Permalink
distroless-iptables: provide debian 12 bookworm variant
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 30, 2023
1 parent 56ea604 commit c89f216
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,10 @@ dependencies:
match: IMAGE_VERSION\ \?=\ 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: dependents"
version: v2.3.1-go1.20.7-bullseye.0
version: v2.3.1-go1.21.0-bookworm.0
refPaths:
- path: images/build/distroless-iptables/Makefile
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bookworm\.\d+

- name: "registry.k8s.io/build-image/setcap"
version: bookworm-v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions images/build/distroless-iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ IMAGE=$(REGISTRY)/distroless-iptables
TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= v0.2.7
CONFIG ?= distroless
BASEIMAGE ?= debian:bullseye-slim
GORUNNER_VERSION ?= v2.3.1-go1.20.7-bullseye.0
BASEIMAGE ?= debian:bookworm-slim
GORUNNER_VERSION ?= v2.3.1-go1.21.0-bookworm.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
6 changes: 5 additions & 1 deletion images/build/distroless-iptables/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
variants:
distroless:
go1.20-distroless:
CONFIG: 'distroless'
IMAGE_VERSION: 'v0.2.7'
GORUNNER_VERSION: 'v2.3.1-go1.20.6-bullseye.0'
go1.21-distroless:
CONFIG: 'distroless'
IMAGE_VERSION: 'v0.2.7'
GORUNNER_VERSION: 'v2.3.1-go1.21.0-bookworm.0'

0 comments on commit c89f216

Please sign in to comment.