git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge branch 'master' into goversion
commit8b06d255f78997089ee5970b1937b4c558d6308d authorPhil Taprogge <philt@pusher.com> dateFri 3 May 2019, 12:37 (7 years ago) parent8fca58c81c9185
4 files changed+4−6
compare with master
unifiedsplit
CHANGELOG.md+1 Dockerfile+1−2 Dockerfile.arm64+1−2 Dockerfile.armv6+1−2
CHANGELOG.md+1
@@ -3,6 +3,7 @@
33## Changes since v3.2.0
44
55- [#144](https://github.com/pusher/oauth2_proxy/pull/144) Use GO 1.12 for ARM builds (@kskewes)
6+- [#142](https://github.com/pusher/oauth2_proxy/pull/142) ARM Docker USER fix (@kskewes)
67- [#52](https://github.com/pusher/oauth2_proxy/pull/52) Logging Improvements (@MisterWil)
78 - Implement flags to configure file logging
89 - `-logging-filename` Defines the filename to log to
Dockerfile+1−2
@@ -25,7 +25,6 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifi
2525COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2626COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
2727
28−RUN addgroup -S -g 2000 oauth2proxy && adduser -S -u 2000 oauth2proxy -G oauth2proxy
29−USER oauth2proxy
28+USER 2000:2000
3029
3130ENTRYPOINT ["/bin/oauth2_proxy"]
Dockerfile.arm64+1−2
@@ -25,7 +25,6 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifi
2525COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2626COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
2727
28−RUN addgroup -S -g 2000 oauth2proxy && adduser -S -u 2000 oauth2proxy -G oauth2proxy
29−USER oauth2proxy
28+USER 2000:2000
3029
3130ENTRYPOINT ["/bin/oauth2_proxy"]
Dockerfile.armv6+1−2
@@ -25,7 +25,6 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifi
2525COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2626COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
2727
28−RUN addgroup -S -g 2000 oauth2proxy && adduser -S -u 2000 oauth2proxy -G oauth2proxy
29−USER oauth2proxy
28+USER 2000:2000
3029
3130ENTRYPOINT ["/bin/oauth2_proxy"]