diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f3d1a72..5dee4c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#2220](https://github.com/oauth2-proxy/oauth2-proxy/pull/2220) Added binary and docker release platforms (@kvanzuijlen) - [#2221](https://github.com/oauth2-proxy/oauth2-proxy/pull/2221) Backwards compatible fix for wrong environment variable name (OAUTH2_PROXY_GOOGLE_GROUPS) (@kvanzuijlen) - [#1989](https://github.com/oauth2-proxy/oauth2-proxy/pull/1989) Fix default scope for keycloak-oidc provider +- [#2217](https://github.com/oauth2-proxy/oauth2-proxy/pull/2217) Upgrade alpine to version 3.18 (@polarctos) # V7.5.0 diff --git a/Dockerfile b/Dockerfile index 87fdd58e..e2726965 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This ARG has to be at the top, otherwise the docker daemon does not known what to do with FROM ${RUNTIME_IMAGE} -ARG RUNTIME_IMAGE=docker.io/library/alpine:3.17.2 +ARG RUNTIME_IMAGE=docker.io/library/alpine:3.18 # All builds should be done using the platform native to the build node to allow # cache sharing of the go mod download step. diff --git a/Makefile b/Makefile index 2cb07419..619823b7 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ $(BINARY): CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7 DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v6,linux/arm/v7 -DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.17.2 +DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.18 DOCKER_BUILDX_ARGS ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE} DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --build-arg VERSION=${VERSION} DOCKER_BUILDX_X_PLATFORM := $(DOCKER_BUILDX) --platform ${DOCKER_BUILD_PLATFORM}