Merge pull request #275 from caddyserver/nsswitch-fix-removal

Remove obsolete nsswitch fix
caddyserver · Jan 19, 2023 · 579fe03 · 579fe03
2 parents aca93ae + b6dcb8f
commit 579fe03
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile
@@ -33,10 +33,6 @@ RUN set -eux; \
 	chmod +x /usr/bin/caddy; \
 	caddy version
 
-# set up nsswitch.conf for Go's "netgo" implementation
-# - https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9
-RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
-
 # See https://caddyserver.com/docs/conventions#file-locations for details
 ENV XDG_CONFIG_HOME /config
 ENV XDG_DATA_HOME /data

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
@@ -33,10 +33,6 @@ RUN set -eux; \
 	chmod +x /usr/bin/caddy; \
 	caddy version
 
-# set up nsswitch.conf for Go's "netgo" implementation
-# - https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9
-RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
-
 # See https://caddyserver.com/docs/conventions#file-locations for details
 ENV XDG_CONFIG_HOME /config
 ENV XDG_DATA_HOME /data

diff --git a/library/caddy b/library/caddy
@@ -7,7 +7,7 @@ Tags: 2.6.2-alpine, 2.6-alpine, 2-alpine, alpine
 SharedTags: 2.6.2, 2.6, 2, latest
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.6/alpine
-GitCommit: 9c857d39bef831f27612106ddd00a4df307e8975
+GitCommit: 7bebcbe6a3abe6ed873568ae40fbe23d9b7ce6d0
 Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
 
 Tags: 2.6.2-builder-alpine, 2.6-builder-alpine, 2-builder-alpine, builder-alpine