From 0b24f45965d19c96058030810e7b2b882eee55a7 Mon Sep 17 00:00:00 2001 From: Jan Larwig Date: Sat, 20 Jan 2024 20:48:36 +0100 Subject: [PATCH] remove nsswitch workaround (#2371) Co-authored-by: Joel Speed --- CHANGELOG.md | 1 + Dockerfile | 1 - nsswitch.conf | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 nsswitch.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d58d08f..634dcdfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - [#2343](https://github.com/oauth2-proxy/oauth2-proxy/pull/2343) chore: Added checksums for .tar.gz (@kvanzuijlen) - [#2248](https://github.com/oauth2-proxy/oauth2-proxy/pull/2248) Added support for semicolons in query strings. (@timwsuqld) - [#2196](https://github.com/oauth2-proxy/oauth2-proxy/pull/2196) Add GitHub groups (orgs/teams) support. Including `X-Forwarded-Groups` header (@tuunit) +- [#2371](https://github.com/oauth2-proxy/oauth2-proxy/pull/2371) Remove nsswitch DNS resolution workaround (@tuunit) - [#2295](https://github.com/oauth2-proxy/oauth2-proxy/pull/2295) Change base-image to [GoogleContainerTools/distroless](https://github.com/GoogleContainerTools/distroless) (@kvanzuijlen) - [#2356](https://github.com/oauth2-proxy/oauth2-proxy/pull/2356) Update go-jose dependency (@dasvh) - [#2357](https://github.com/oauth2-proxy/oauth2-proxy/pull/2357) Update ojg to latest release (@bitfehler) diff --git a/Dockerfile b/Dockerfile index a997d295..be3e7dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,6 @@ RUN case ${TARGETPLATFORM} in \ # Copy binary to runtime image FROM ${RUNTIME_IMAGE} -COPY nsswitch.conf /etc/nsswitch.conf COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem diff --git a/nsswitch.conf b/nsswitch.conf deleted file mode 100644 index 21fae738..00000000 --- a/nsswitch.conf +++ /dev/null @@ -1 +0,0 @@ -hosts: files dns