From f9fb530c11f21ed00a25e660b4bd53fb75f2ed54 Mon Sep 17 00:00:00 2001 From: mgiessing Date: Thu, 17 Feb 2022 22:55:57 +0100 Subject: [PATCH 1/6] Update Dockerfile Add ppc64le support --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e1171f93..e6963e32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ ARG BUILDPLATFORM RUN case ${TARGETPLATFORM} in \ "linux/amd64") GOARCH=amd64 ;; \ "linux/arm64") GOARCH=arm64 ;; \ + "linux/ppc64le") GOARCH=ppc64le ;; \ "linux/arm/v6") GOARCH=arm GOARM=6 ;; \ esac && \ printf "Building OAuth2 Proxy for arch ${GOARCH}\n" && \ From 24c826c8832bb36bf992442b8800355a1b00ca86 Mon Sep 17 00:00:00 2001 From: mgiessing Date: Thu, 17 Feb 2022 22:57:54 +0100 Subject: [PATCH 2/6] Update Makefile Add ppc64le support --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index fc7c6645..d33f3b88 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,8 @@ docker-all: docker $(DOCKER_BUILDX) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 . $(DOCKER_BUILDX) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 . $(DOCKER_BUILDX) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 . + $(DOCKER_BUILDX) --platform linux/ppc64le -t $(REGISTRY)/oauth2-proxy:latest-ppc64le . + $(DOCKER_BUILDX) --platform linux/ppc64le -t $(REGISTRY)/oauth2-proxy:${VERSION}-ppc64le . $(DOCKER_BUILDX) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 . $(DOCKER_BUILDX) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 . @@ -71,6 +73,8 @@ docker-push-all: docker-push $(DOCKER_BUILDX_PUSH) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 . $(DOCKER_BUILDX_PUSH) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 . $(DOCKER_BUILDX_PUSH) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 . + $(DOCKER_BUILDX_PUSH) --platform linux/ppc64le -t $(REGISTRY)/oauth2-proxy:latest-ppc64le . + $(DOCKER_BUILDX_PUSH) --platform linux/ppc64le -t $(REGISTRY)/oauth2-proxy:${VERSION}-ppc64le . $(DOCKER_BUILDX_PUSH) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 . $(DOCKER_BUILDX_PUSH) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 . From e4c32df61e2b6804d33b0132f6a78d014f6eeda2 Mon Sep 17 00:00:00 2001 From: mgiessing Date: Thu, 17 Feb 2022 22:59:11 +0100 Subject: [PATCH 3/6] Update dist.sh Add ppc64le support --- dist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.sh b/dist.sh index 18e62fbe..db224f64 100755 --- a/dist.sh +++ b/dist.sh @@ -7,7 +7,7 @@ if [[ -z ${BINARY} ]] || [[ -z ${VERSION} ]]; then exit 1 fi -ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64) +ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-ppc64le linux-armv6 freebsd-amd64 windows-amd64) mkdir -p release From ac3b36f57a6785067341af6e975acb04780d754a Mon Sep 17 00:00:00 2001 From: mgiessing Date: Thu, 17 Feb 2022 23:08:53 +0100 Subject: [PATCH 4/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d33f3b88..a0ff29d9 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ build: validate-go-version clean $(BINARY) $(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/arm/v6 +DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v6 DOCKER_BUILDX_ARGS ?= DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --build-arg VERSION=${VERSION} DOCKER_BUILDX_X_PLATFORM := $(DOCKER_BUILDX) --platform ${DOCKER_BUILD_PLATFORM} From 873ce3f1c34a2789ea7b691303c6f3f4175fba01 Mon Sep 17 00:00:00 2001 From: mgiessing Date: Thu, 17 Feb 2022 23:19:26 +0100 Subject: [PATCH 5/6] Update README.md Add ppc64le support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61706bf4..dbb08500 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Going forward, all images shall be available at `quay.io/oauth2-proxy/oauth2-pro b. Build with `$ go get github.com/oauth2-proxy/oauth2-proxy/v7` which will put the binary in `$GOROOT/bin` - c. Using the prebuilt docker image [quay.io/oauth2-proxy/oauth2-proxy](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, ARMv6 and ARM64 tags available) + c. Using the prebuilt docker image [quay.io/oauth2-proxy/oauth2-proxy](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, PPC64LE, ARMv6 and ARM64 tags available) Prebuilt binaries can be validated by extracting the file and verifying it against the `sha256sum.txt` checksum file provided for each release starting with version `v3.0.0`. From 515d0f255e03cb1a052235fcadcfb1b2898a378c Mon Sep 17 00:00:00 2001 From: mgiessing Date: Fri, 18 Feb 2022 14:20:25 +0100 Subject: [PATCH 6/6] Update CHANGELOG.md Add ppc64le support --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31265aab..e1e112c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ## Changes since v7.2.1 +- [#1561](https://github.com/oauth2-proxy/oauth2-proxy/pull/1561) Add ppc64le support (@mgiessing) - [#1560](https://github.com/oauth2-proxy/oauth2-proxy/pull/1560) Fix provider data initialisation (@JoelSpeed) - [#1555](https://github.com/oauth2-proxy/oauth2-proxy/pull/1555) Refactor provider configuration into providers package (@JoelSpeed) - [#1394](https://github.com/oauth2-proxy/oauth2-proxy/pull/1394) Add generic claim extractor to get claims from ID Tokens (@JoelSpeed)