From d74e4642e3dfd9b465d07359e680f406ba989234 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 8 Dec 2020 14:28:12 -0800 Subject: [PATCH] avoid updating nsswitch.conf for redhat UBI images (#11056) --- Dockerfile.cicd | 3 +-- Dockerfile.dev | 1 - Dockerfile.dev.browser | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile.cicd b/Dockerfile.cicd index 1d509c9d8..d35e4e9be 100644 --- a/Dockerfile.cicd +++ b/Dockerfile.cicd @@ -31,8 +31,7 @@ COPY --from=builder /go/minio/dockerscripts/docker-entrypoint.sh /usr/bin/ RUN \ microdnf update --nodocs && \ microdnf install curl ca-certificates shadow-utils util-linux --nodocs && \ - microdnf clean all && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf + microdnf clean all ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] diff --git a/Dockerfile.dev b/Dockerfile.dev index ce9a8524d..f92ac6afd 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -19,7 +19,6 @@ RUN \ microdnf update --nodocs && \ microdnf install curl ca-certificates shadow-utils util-linux --nodocs && \ microdnf clean all && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ chmod +x /usr/bin/minio && \ chmod +x /usr/bin/docker-entrypoint.sh diff --git a/Dockerfile.dev.browser b/Dockerfile.dev.browser index fbdbfed31..2fc9e9787 100644 --- a/Dockerfile.dev.browser +++ b/Dockerfile.dev.browser @@ -1,4 +1,4 @@ -FROM ubuntu +FROM ubuntu:20.04 LABEL maintainer="MinIO Inc "