From 0fb3937d46a4ac134996cb19eec81f9b3893232d Mon Sep 17 00:00:00 2001 From: Leandro Lafin Date: Fri, 12 Jul 2024 15:30:38 -0300 Subject: [PATCH] Remove nsswitch DNS resolution workaround --- 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 92639c84..146372c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - [#2297](https://github.com/oauth2-proxy/oauth2-proxy/pull/2297) Add nightly build and push (@tuunit) - [#2299](https://github.com/oauth2-proxy/oauth2-proxy/pull/2299) bugfix: OIDCConfig based providers are not respecting flags and configs (@tuunit) - [#2343](https://github.com/oauth2-proxy/oauth2-proxy/pull/2343) chore: Added checksums for .tar.gz (@kvanzuijlen) +- [#2371](https://github.com/oauth2-proxy/oauth2-proxy/pull/2371) Remove nsswitch DNS resolution workaround (@tuunit) - [#2196](https://github.com/oauth2-proxy/oauth2-proxy/pull/2196) Add GitHub groups (orgs/teams) support. Including `X-Forwarded-Groups` header (@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) diff --git a/Dockerfile b/Dockerfile index 24b12821..47f89549 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