05a4e77 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

on master help sign in

Multiarch builds (#1147)

05a4e77Ryan Hartje5 years ago

.github/workflows/ci.yaml+7

compare with master

unifiedsplit

@@ -57,6 +57,13 @@ jobs:

57 - name: Check out code

58 uses: actions/checkout@v2

60+ - name: Set up Docker Buildx

61+ id: buildx

62+ uses: crazy-max/ghaction-docker-buildx@v3

63+ with:

64+ buildx-version: latest

65+ qemu-version: latest

66+

60 - name: Docker Build

67 - name: Docker Build

61 run: |

68 run: |

62 make docker

69 make docker

CHANGELOG.md+2−1

@@ -8,7 +8,7 @@

8 deserialization from v6.0.0 (only) has been removed to improve performance. If you are on v6.0.0, either upgrade

9 to a version before this first and allow legacy sessions to expire gracefully or change your `cookie-secret`

10 value and force all sessions to reauthenticate.

11−

11+

12- [#1210](https://github.com/oauth2-proxy/oauth2-proxy/pull/1210) A new `keycloak-oidc` provider has been added with support for role based authentication. The existing keycloak auth provider will eventually be deprecated and removed. Please switch to the new provider `keycloak-oidc`.

14## Breaking Changes

@@ -36,6 +36,7 @@

36- [#1330](https://github.com/oauth2-proxy/oauth2-proxy/pull/1330) Allow specifying URL as input for custom sign in logo (@MaikuMori)

37- [#1357](https://github.com/oauth2-proxy/oauth2-proxy/pull/1357) Fix unsafe access to session variable (@harzallah)

38- [#997](https://github.com/oauth2-proxy/oauth2-proxy/pull/997) Allow passing the raw url path when proxying upstream requests - e.g. /%2F/ (@FStelzer)

39+- [#1147](https://github.com/oauth2-proxy/oauth2-proxy/pull/1147) Multiarch support for docker image (@goshlanguage)

40# V7.1.3

41# V7.1.3

Makefile+5−4

@@ -13,8 +13,6 @@ MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1

13MINIMUM_SUPPORTED_GO_MINOR_VERSION = 15

14GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION)

16−DOCKER_BUILD := docker build --build-arg VERSION=${VERSION}

17−

18ifeq ($(COVER),true)

16ifeq ($(COVER),true)

19TESTCOVER ?= -coverprofile c.out

17TESTCOVER ?= -coverprofile c.out

20endif

18endif

@@ -41,9 +39,12 @@ build: validate-go-version clean $(BINARY)

41$(BINARY):

39$(BINARY):

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

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

42+DOCKER_BUILD := docker build --build-arg VERSION=${VERSION}

43+DOCKER_BUILDX := docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v6 --build-arg VERSION=${VERSION}

44+

44.PHONY: docker

45.PHONY: docker

45docker:

46docker:

46− $(DOCKER_BUILD) -f Dockerfile -t $(REGISTRY)/oauth2-proxy:latest .

47+ $(DOCKER_BUILDX) -f Dockerfile -t $(REGISTRY)/oauth2-proxy:latest .

48.PHONY: docker-all

49.PHONY: docker-all

49docker-all: docker

50docker-all: docker

@@ -57,7 +58,7 @@ docker-all: docker

58.PHONY: docker-push

59.PHONY: docker-push

59docker-push:

60docker-push:

60− docker push $(REGISTRY)/oauth2-proxy:latest

61+ docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:latest .

62.PHONY: docker-push-all

63.PHONY: docker-push-all

63docker-push-all: docker-push

64docker-push-all: docker-push