e9a4654 · typeable/oauth2-proxy

CHANGELOG.md+1

@@ -9,6 +9,7 @@

9## Changes since v7.4.0

10

11- [#1882](https://github.com/oauth2-proxy/oauth2-proxy/pull/1882) Make `htpasswd.GetUsers` racecondition safe

12+- [#1883](https://github.com/oauth2-proxy/oauth2-proxy/pull/1883) Ensure v8 manifest variant is set on docker images

12

13

13# V7.4.0

14# V7.4.0

14

15

Dockerfile+1−1

@@ -35,7 +35,7 @@ RUN case ${TARGETPLATFORM} in \

35 "linux/amd64") GOARCH=amd64 ;; \

36 # arm64 and arm64v8 are equivilant in go and do not require a goarm

37 # https://github.com/golang/go/wiki/GoArm

38− "linux/arm64" | "linux/arm64/v8") GOARCH=arm64 ;; \

38+ "linux/arm64" | "linux/arm/v8") GOARCH=arm64 ;; \

39 "linux/ppc64le") GOARCH=ppc64le ;; \

40 "linux/arm/v6") GOARCH=arm GOARM=6 ;; \

41 esac && \

Makefile+1−1

@@ -39,7 +39,7 @@ build: validate-go-version clean $(BINARY)

39$(BINARY):

40 CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7

41

42−DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v6,linux/arm64/v8

42+DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/ppc64le,linux/arm/v6,linux/arm/v8

43DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.15

44DOCKER_BUILDX_ARGS ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE}

45DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --build-arg VERSION=${VERSION}