Skip to content

Commit

Permalink
Bump distroless-iptables to v0.3.1 and Go to 1.21
Browse files Browse the repository at this point in the history
Also bump bash-static to the version from Debian 12 (Bookworm), since
distroless-iptables v0.3.1 is now based on Debian 12, and bash-static
from Debian 11 crashes with SIGSEGV there.
  • Loading branch information
jingyuanliang committed Sep 7, 2023
1 parent 992c65e commit 903cd83
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ALL_PLATFORMS ?= linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x

# The "FROM" part of the Dockerfile. This should be a manifest-list which
# supports all of the platforms listed in ALL_PLATFORMS.
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.2.5
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.3.1

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
Expand Down Expand Up @@ -60,7 +60,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.20
GO_VERSION := 1.21
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN /alpine-extractor.sh musl openssl-dev openssl-libs-static linux-headers

## The bash container fetches bash-static (to be used as bash) from Debian repo.

FROM debian:11.4 AS bash
FROM debian:bookworm-slim AS bash

RUN apt-get update
RUN apt-get install -y --no-install-recommends --no-install-suggests bash-static
Expand Down
4 changes: 2 additions & 2 deletions scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ALL_PLATFORMS ?= linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x

# The "FROM" part of the Dockerfile. This should be a manifest-list which
# supports all of the platforms listed in ALL_PLATFORMS.
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.2.5
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.3.1

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
Expand Down Expand Up @@ -70,7 +70,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.20
GO_VERSION := 1.21
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down

0 comments on commit 903cd83

Please sign in to comment.