From c00d36159e9b55c42554593e6bf305e706acb5b3 Mon Sep 17 00:00:00 2001
From: Anders Kiel Hovgaard <akhovg@gmail.com>
Date: Fri, 18 Jun 2021 14:12:11 +0200
Subject: [PATCH] Update Alpine image version to 3.14 (#1244)

* Update Alpine image version to 3.14.

* Update changelog.
---
 CHANGELOG.md     | 1 +
 Dockerfile       | 2 +-
 Dockerfile.arm64 | 2 +-
 Dockerfile.armv6 | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd3d6d3c..31ad700e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#1142](https://github.com/oauth2-proxy/oauth2-proxy/pull/1142) Add pagewriter to upstream proxy (@JoelSpeed)
 - [#1181](https://github.com/oauth2-proxy/oauth2-proxy/pull/1181) Fix incorrect `cfg` name in show-debug-on-error flag (@iTaybb)
 - [#1207](https://github.com/oauth2-proxy/oauth2-proxy/pull/1207) Fix URI fragment handling on sign-in page, regression introduced in 7.1.0 (@tarvip)
+- [#1244](https://github.com/oauth2-proxy/oauth2-proxy/pull/1244) Update Alpine image version to 3.14 (@ahovgaard)
 
 
 # V7.1.3
diff --git a/Dockerfile b/Dockerfile
index bf5fbb95..321f5691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ ARG VERSION
 RUN VERSION=${VERSION} make build && touch jwt_signing_key.pem
 
 # Copy binary to alpine
-FROM alpine:3.13
+FROM alpine:3.14
 COPY nsswitch.conf /etc/nsswitch.conf
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index d4c00d5d..998a07d6 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -21,7 +21,7 @@ ARG VERSION
 RUN VERSION=${VERSION} GOARCH=arm64 make build && touch jwt_signing_key.pem
 
 # Copy binary to alpine
-FROM arm64v8/alpine:3.13
+FROM arm64v8/alpine:3.14
 COPY nsswitch.conf /etc/nsswitch.conf
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy
diff --git a/Dockerfile.armv6 b/Dockerfile.armv6
index f413b155..cebc5402 100644
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@@ -21,7 +21,7 @@ ARG VERSION
 RUN VERSION=${VERSION} GOARCH=arm GOARM=6 make build && touch jwt_signing_key.pem
 
 # Copy binary to alpine
-FROM arm32v6/alpine:3.13
+FROM arm32v6/alpine:3.14
 COPY nsswitch.conf /etc/nsswitch.conf
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy