From f71a7fd2a2de90bc7c711a171919c6f50fb4f4b7 Mon Sep 17 00:00:00 2001 From: priby05 <150486864+priby05@users.noreply.github.com> Date: Fri, 23 Aug 2024 02:02:02 -0500 Subject: [PATCH] feature/s390x architecture support (#2734) * Add s390x architecture support * Update CHANGELOG --- CHANGELOG.md | 1 + Dockerfile | 1 + README.md | 4 ++-- dist.sh | 1 + docs/docs/installation.md | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5476524..36993d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - [#2674](https://github.com/oauth2-proxy/oauth2-proxy/pull/2674) docs: additional notes about available claims for HeaderValue (@vegetablest) - [#2459](https://github.com/oauth2-proxy/oauth2-proxy/pull/2459) chore(deps): Updated to ginkgo v2 (@kvanzuijlen, @tuunit) - [#2112](https://github.com/oauth2-proxy/oauth2-proxy/pull/2112) docs: update list of providers which support refresh tokens (@mikefab-msf) +- [#2734](https://github.com/oauth2-proxy/oauth2-proxy/pull/2734) Added s390x architecture option support (@priby05) # V7.6.0 diff --git a/Dockerfile b/Dockerfile index ef4c3528..59ffda36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ RUN case ${TARGETPLATFORM} in \ # https://github.com/golang/go/wiki/GoArm "linux/arm64" | "linux/arm/v8") GOARCH=arm64 ;; \ "linux/ppc64le") GOARCH=ppc64le ;; \ + "linux/s390x") GOARCH=s390x ;; \ "linux/arm/v6") GOARCH=arm GOARM=6 ;; \ "linux/arm/v7") GOARCH=arm GOARM=7 ;; \ esac && \ diff --git a/README.md b/README.md index d0de784e..55eaec53 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,9 @@ Going forward, all images shall be available at `quay.io/oauth2-proxy/oauth2-pro ``` This will install the binary into `$GOPATH/bin`. Make sure you include `$GOPATH` in your `$PATH`. Otherwise your system won't find binaries installed via `go install` - c. Using a [Prebuilt Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, PPC64LE, ARMv6, ARMv7, and ARM64 available) + c. Using a [Prebuilt Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, PPC64LE, S390x, ARMv6, ARMv7, and ARM64 available) - d. Using a [Pre-Release Nightly Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy-nightly) (AMD64, PPC64LE, ARMv6, ARMv7, and ARM64 available) + d. Using a [Pre-Release Nightly Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy-nightly) (AMD64, PPC64LE, S390x, ARMv6, ARMv7, and ARM64 available) e. Using the official [Kubernetes manifest](https://github.com/oauth2-proxy/manifests) (Helm) diff --git a/dist.sh b/dist.sh index 7b3a3aff..0990fff2 100755 --- a/dist.sh +++ b/dist.sh @@ -16,6 +16,7 @@ ARCHS=( linux-armv6 linux-armv7 linux-ppc64le + linux-s390x freebsd-amd64 windows-amd64 ) diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 522bfab9..9219953e 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -13,7 +13,7 @@ title: Installation ``` This will install the binary into `$GOPATH/bin`. Make sure you include `$GOPATH` in your `$PATH`. Otherwise your system won't find binaries installed via `go install` - c. Using a [Prebuilt Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, PPC64LE, ARMv6, ARMv7, and ARM64 available) + c. Using a [Prebuilt Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, PPC64LE, S390x, ARMv6, ARMv7, and ARM64 available) d. Using a [Pre-Release Nightly Docker Image](https://quay.io/oauth2-proxy/oauth2-proxy-nightly) (AMD64, PPC64LE, ARMv6, ARMv7, and ARM64 available)