From 48b1658e5d3df3dd4321da5a5de011b5d25b6382 Mon Sep 17 00:00:00 2001 From: Nishanth Reddy Date: Sat, 30 Jan 2021 07:33:28 -0800 Subject: [PATCH] Update alpine version to 3.13 (#1013) * Update alpine version to 3.13 alpine 3.12 has a CVE https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-28928 which got fixed in recent version * address review comments --- 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 8c0d9ff5..a3e30e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,6 +113,7 @@ - [#829](https://github.com/oauth2-proxy/oauth2-proxy/pull/820) Rename test directory to testdata (@johejo) - [#819](https://github.com/oauth2-proxy/oauth2-proxy/pull/819) Improve CI (@johejo) - [#989](https://github.com/oauth2-proxy/oauth2-proxy/pull/989) Adapt isAjax to support mimetype lists (@rassie) +- [#1013](https://github.com/oauth2-proxy/oauth2-proxy/pull/1013) Update alpine version to 3.13 (@nishanth-pinnapareddy) # v6.1.1 diff --git a/Dockerfile b/Dockerfile index a47a9ce0..33e4e4b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY . . RUN VERSION=${VERSION} make build && touch jwt_signing_key.pem # Copy binary to alpine -FROM alpine:3.12 +FROM alpine:3.13 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 9b3b09aa..771dd8fb 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -20,7 +20,7 @@ COPY . . RUN VERSION=${VERSION} GOARCH=arm64 make build && touch jwt_signing_key.pem # Copy binary to alpine -FROM arm64v8/alpine:3.12 +FROM arm64v8/alpine:3.13 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 88bfd58a..51c89a1b 100644 --- a/Dockerfile.armv6 +++ b/Dockerfile.armv6 @@ -20,7 +20,7 @@ COPY . . RUN VERSION=${VERSION} GOARCH=arm GOARM=6 make build && touch jwt_signing_key.pem # Copy binary to alpine -FROM arm32v6/alpine:3.12 +FROM arm32v6/alpine:3.13 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