git.iko.soy/typeable/oauth2-proxy
on master help sign in
Add nsswitch.conf to Docker image (#400)

* Add nsswitch.conf to Docker image Created nsswitch.conf to use locally defined translations before DNS. Copied to /etc/nsswitch.conf in the image. * Add new line * Updated Changelog Co-authored-by: Dan Bond <danbond@protonmail.com>

commit4f553bcfc8b0e3dc7eeb4734aefcb393494a3aa1 authorLuke Tainton <luke+dev@tainton.uk> dateSun 23 Feb 2020, 18:16 (7 years ago) parentbd79b97
5 files changed+5
compare with master
unifiedsplit
CHANGELOG.md+1 Dockerfile+1 Dockerfile.arm64+1 Dockerfile.armv6+1 nsswitch.conf+1
CHANGELOG.md+1
@@ -9,6 +9,7 @@
99
1010## Changes since v5.0.0
1111
12+- [#400](https://github.com/pusher/oauth2_proxy/pull/400) Add `nsswitch.conf` to Docker image to allow hosts file to work (@luketainton)
1213- [#385](https://github.com/pusher/oauth2_proxy/pull/385) Use the `Authorization` header instead of `access_token` for refreshing GitHub Provider sessions (@ibuclaw)
1314- [#372](https://github.com/pusher/oauth2_proxy/pull/372) Allow fallback to secondary verified email address in GitHub provider (@dmnemec)
1415- [#335](https://github.com/pusher/oauth2_proxy/pull/335) OIDC Provider support for empty id_tokens in the access token refresh response (@howzat)
Dockerfile+1
@@ -23,6 +23,7 @@ RUN ./configure && make build && touch jwt_signing_key.pem
2323
2424# Copy binary to alpine
2525FROM alpine:3.10
26+COPY nsswitch.conf /etc/nsswitch.conf
2627COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
2728COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2829COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
Dockerfile.arm64+1
@@ -23,6 +23,7 @@ RUN ./configure && GOARCH=arm64 make build && touch jwt_signing_key.pem
2323
2424# Copy binary to alpine
2525FROM arm64v8/alpine:3.10
26+COPY nsswitch.conf /etc/nsswitch.conf
2627COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
2728COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2829COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
Dockerfile.armv6+1
@@ -23,6 +23,7 @@ RUN ./configure && GOARCH=arm GOARM=6 make build && touch jwt_signing_key.pem
2323
2424# Copy binary to alpine
2525FROM arm32v6/alpine:3.10
26+COPY nsswitch.conf /etc/nsswitch.conf
2627COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
2728COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
2829COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
nsswitch.confnew file+1
@@ -0,0 +1 @@
1+hosts: files dns