mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
docker: remove nsswitch.conf
Signed-off-by: Iavael <905853+iavael@users.noreply.github.com>
This commit is contained in:
parent
e4b154231c
commit
d2fc8dbeeb
@ -6,11 +6,6 @@ ADD etcdctl /usr/local/bin/
|
|||||||
WORKDIR /var/etcd/
|
WORKDIR /var/etcd/
|
||||||
WORKDIR /var/lib/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
|
EXPOSE 2379 2380
|
||||||
|
|
||||||
# Define default command.
|
# Define default command.
|
||||||
|
@ -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
|
|
||||||
|
|
@ -37,8 +37,6 @@ mkdir -p "${IMAGEDIR}"/var/etcd
|
|||||||
mkdir -p "${IMAGEDIR}"/var/lib/etcd
|
mkdir -p "${IMAGEDIR}"/var/lib/etcd
|
||||||
cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
|
cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
|
||||||
|
|
||||||
cp ./nsswitch.conf "${IMAGEDIR}"
|
|
||||||
|
|
||||||
cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
|
cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
|
||||||
|
|
||||||
if [ -z "$TAG" ]; then
|
if [ -z "$TAG" ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user