git.iko.soy/typeable/oauth2-proxy
on master help sign in
fix Docker user on arm

Use simple USER directive. Using `addgroup` in final `arm` image when building on amd64 doesn't work. I must have made a mistake during cross build verification. Alternative is to use qemu-static but it's not worth it for this.

commit308bcc06a4ee1ffc7b168600d445b540243ce4ab authorKarl Skewes <karl.skewes@gmail.com> dateFri 3 May 2019, 18:38 (7 years ago) parent93b7d31
4 files changed+6−8
compare with master
unifiedsplit
CHANGELOG.md+1 Dockerfile+1−2 Dockerfile.arm64+2−3 Dockerfile.armv6+2−3
CHANGELOG.md+1
@@ -2,6 +2,7 @@
22
33## Changes since v3.2.0
44
5+- [#142](https://github.com/pusher/oauth2_proxy/pull/142) ARM Docker USER fix (@kskewes)
56- [#52](https://github.com/pusher/oauth2_proxy/pull/52) Logging Improvements (@MisterWil)
67 - Implement flags to configure file logging
78 - `-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+2−3
@@ -1,4 +1,4 @@
1−FROM golang:1.11-stretch AS builder
1+FROM golang:1.12-stretch AS builder
22
33# Download tools
44RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
@@ -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+2−3
@@ -1,4 +1,4 @@
1−FROM golang:1.11-stretch AS builder
1+FROM golang:1.12-stretch AS builder
22
33# Download tools
44RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
@@ -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"]