avoid updating nsswitch.conf for redhat UBI images (#11056)

3 years ago · d74e4642e3
parent a51488cbaa
commit d74e4642e3
3 changed files with 2 additions and 4 deletions
--- 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"]

--- 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

--- a/Dockerfile.dev.browser
+++ b/Dockerfile.dev.browser
@ -1,4 +1,4 @@
-FROM ubuntu
+FROM ubuntu:20.04

 LABEL maintainer="MinIO Inc <dev@min.io>"