From dc2b198cc76c9ccb8beb1dcf691f844037524dea Mon Sep 17 00:00:00 2001
From: Iavael <905853+iavael@users.noreply.github.com>
Date: Sat, 21 Jan 2023 00:55:44 +0400
Subject: [PATCH] docker: remove nsswitch.conf

Co-authored-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Iavael <905853+iavael@users.noreply.github.com>
---
 CHANGELOG/CHANGELOG-3.5.md |  3 +++
 Dockerfile-release.amd64   |  5 -----
 nsswitch.conf              | 22 ----------------------
 scripts/build-docker.sh    |  2 --
 4 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 nsswitch.conf

diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md
index 4fdc38ca6..5919842ff 100644
--- a/CHANGELOG/CHANGELOG-3.5.md
+++ b/CHANGELOG/CHANGELOG-3.5.md
@@ -12,6 +12,9 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
 ### Dependency
 - Bump bbolt to [v1.3.7](https://github.com/etcd-io/etcd/pull/15222).
 
+### Other
+- [Remove nsswitch.conf from docker image](https://github.com/etcd-io/etcd/pull/15161)
+
 <hr>
 
 ## v3.5.7 (2023-01-20)
diff --git a/Dockerfile-release.amd64 b/Dockerfile-release.amd64
index 09ed48076..4f2fcbed3 100644
--- a/Dockerfile-release.amd64
+++ b/Dockerfile-release.amd64
@@ -7,11 +7,6 @@ ADD etcdutl /usr/local/bin/
 WORKDIR /var/etcd/
 WORKDIR /var/lib/etcd/
 
-# Alpine Linux doesn't use pam, which means that there is no /etc/nsswitch.conf,
-# but Golang relies on /etc/nsswitch.conf to check the order of DNS resolving
-# (see https://github.com/golang/go/commit/9dee7771f561cf6aee081c0af6658cc81fac3918)
-ADD nsswitch.conf /etc/nsswitch.conf
-
 EXPOSE 2379 2380
 
 # Define default command.
diff --git a/nsswitch.conf b/nsswitch.conf
deleted file mode 100644
index 3c827f100..000000000
--- a/nsswitch.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# /etc/nsswitch.conf
-#
-# Example configuration of GNU Name Service Switch functionality.
-# If you have the `glibc-doc-reference' and `info' packages installed, try:
-# `info libc "Name Service Switch"' for information about this file.
-
-passwd:         compat
-group:          compat
-shadow:         compat
-gshadow:        files
-
-hosts:          files dns
-networks:       files
-
-protocols:      db files
-services:       db files
-ethers:         db files
-rpc:            db files
-
-netgroup:       nis
-hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4
-
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index 698a70d62..a255dc2cb 100755
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -32,8 +32,6 @@ mkdir -p "${IMAGEDIR}"/var/etcd
 mkdir -p "${IMAGEDIR}"/var/lib/etcd
 cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${BINARYDIR}"/etcdutl "${IMAGEDIR}"
 
-cp ./nsswitch.conf "${IMAGEDIR}"
-
 cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
 
 if [ -z "$TAG" ]; then