From 348aa6566cbfc7e256b3244f5b159850eeefa9f5 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 22 May 2017 07:05:39 -0700 Subject: [PATCH] Add nsswitch.conf to our docker image (#4379) This will cause the alpine images to resolve DNS using /etc/hosts along with the normal DNS resolver. --- Dockerfile | 3 +++ Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index af9261a9c..a3150ba1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.5 +MAINTAINER Minio Inc + ENV GOPATH /go ENV PATH $PATH:$GOPATH/bin ENV CGO_ENABLED 0 @@ -9,6 +11,7 @@ WORKDIR /go/src/github.com/minio/ RUN \ apk add --no-cache ca-certificates && \ apk add --no-cache --virtual .build-deps git go musl-dev && \ + echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ go get -v -d github.com/minio/minio && \ cd /go/src/github.com/minio/minio && \ go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2334a73cf..d558d2f69 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,7 @@ FROM resin/aarch64-alpine:3.5 +MAINTAINER Minio Inc + ENV GOPATH /go ENV PATH $PATH:$GOPATH/bin ENV CGO_ENABLED 0 @@ -9,6 +11,7 @@ WORKDIR /go/src/github.com/minio/ RUN \ apk add --no-cache ca-certificates && \ apk add --no-cache --virtual .build-deps git go musl-dev && \ + echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ go get -v -d github.com/minio/minio && \ cd /go/src/github.com/minio/minio && \ go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 33e8b65ed..dbbe55ee3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,5 +1,7 @@ FROM resin/armhf-alpine:3.5 +MAINTAINER Minio Inc + ENV GOPATH /go ENV PATH $PATH:$GOPATH/bin ENV CGO_ENABLED 0 @@ -9,6 +11,7 @@ WORKDIR /go/src/github.com/minio/ RUN \ apk add --no-cache ca-certificates && \ apk add --no-cache --virtual .build-deps git go musl-dev && \ + echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ go get -v -d github.com/minio/minio && \ cd /go/src/github.com/minio/minio && \ go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)" && \