From e270dd0066315565d086925edb305be1746f76bc Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Mon, 7 Oct 2019 17:03:15 -0700 Subject: [PATCH 1/3] docker: build from debian buster --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.armv6 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba07b3f2..2a29bf0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-stretch AS builder +FROM golang:1.13-buster AS builder # Download tools RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 2bd671a4..df4fc825 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM golang:1.13-stretch AS builder +FROM golang:1.13-buster AS builder # Download tools RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1 diff --git a/Dockerfile.armv6 b/Dockerfile.armv6 index 9b56ea57..908d2d95 100644 --- a/Dockerfile.armv6 +++ b/Dockerfile.armv6 @@ -1,4 +1,4 @@ -FROM golang:1.13-stretch AS builder +FROM golang:1.13-buster AS builder # Download tools RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1 From a97710d3d29b4b313c397e45483c49d50b2da06c Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Mon, 7 Oct 2019 17:11:14 -0700 Subject: [PATCH 2/3] update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69b9621f..716cee12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#227](https://github.com/pusher/oauth2_proxy/pull/227) Add Keycloak provider (@Ofinka) - [#271](https://github.com/pusher/oauth2_proxy/pull/271) Support Go 1.13 (@dio) +- [#275](https://github.com/pusher/oauth2_proxy/pull/275) docker: build from debian buster (@syscll) # v4.0.0 From 486521da96bd6fa7e0f6e1dd587659f45396d851 Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Mon, 7 Oct 2019 17:11:38 -0700 Subject: [PATCH 3/3] fix previous CHANGELOG error --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 716cee12..d76e8958 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Changes since v4.0.0 - [#227](https://github.com/pusher/oauth2_proxy/pull/227) Add Keycloak provider (@Ofinka) -- [#271](https://github.com/pusher/oauth2_proxy/pull/271) Support Go 1.13 (@dio) +- [#273](https://github.com/pusher/oauth2_proxy/pull/273) Support Go 1.13 (@dio) - [#275](https://github.com/pusher/oauth2_proxy/pull/275) docker: build from debian buster (@syscll) # v4.0.0