git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #1883 from braunsonm/issue-1593

Set correct platform type for arm v8 docker images

commite9a46543580ef6a3e3d48dd4b760ef984f73a995 authorJoel Speed <Joel.speed@hotmail.co.uk> dateFri 4 Nov 2022, 10:15 (4 years ago) parent9484a6792b2231
3 files changed+3−2
compare with master
unifiedsplit
CHANGELOG.md+1 Dockerfile+1−1 Makefile+1−1
CHANGELOG.md+1
@@ -9,6 +9,7 @@
99## Changes since v7.4.0
1010
1111- [#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
1213
1314# V7.4.0
1415
Dockerfile+1−1
@@ -35,7 +35,7 @@ RUN case ${TARGETPLATFORM} in \
3535 "linux/amd64") GOARCH=amd64 ;; \
3636 # arm64 and arm64v8 are equivilant in go and do not require a goarm
3737 # https://github.com/golang/go/wiki/GoArm
38− "linux/arm64" | "linux/arm64/v8") GOARCH=arm64 ;; \
38+ "linux/arm64" | "linux/arm/v8") GOARCH=arm64 ;; \
3939 "linux/ppc64le") GOARCH=ppc64le ;; \
4040 "linux/arm/v6") GOARCH=arm GOARM=6 ;; \
4141 esac && \
Makefile+1−1
@@ -39,7 +39,7 @@ build: validate-go-version clean $(BINARY)
3939$(BINARY):
4040 CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7
4141
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
4343DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.15
4444DOCKER_BUILDX_ARGS ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE}
4545DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --build-arg VERSION=${VERSION}