From cea4f82586b723f353611bb47ca9c41803964d09 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 26 Aug 2018 23:40:21 -0700 Subject: [PATCH] Revert "Remove curl after the usage (#6347)" (#6366) This reverts commit dafa5073cb3dce6be039f5b27733ce71ab1b8fea. This commit revert also fixes #6365 --- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.release | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6358f8f79..bb6a40494 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ WORKDIR /go/src/github.com/minio/ COPY dockerscripts/docker-entrypoint.sh dockerscripts/healthcheck.sh /usr/bin/ RUN \ - apk add --no-cache ca-certificates && \ + apk add --no-cache ca-certificates 'curl>7.61.0' && \ apk add --no-cache --virtual .build-deps git && \ echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ go get -v -d github.com/minio/minio && \ diff --git a/Dockerfile.dev b/Dockerfile.dev index 40b99cf17..73b6cbe20 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -16,7 +16,7 @@ COPY dockerscripts/docker-entrypoint.sh dockerscripts/healthcheck.sh /usr/bin/ COPY . /go/src/github.com/minio/minio RUN \ - apk add --no-cache ca-certificates && \ + apk add --no-cache ca-certificates 'curl>7.61.0' && \ apk add --no-cache --virtual .build-deps git && \ echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ cd /go/src/github.com/minio/minio && \ diff --git a/Dockerfile.release b/Dockerfile.release index 0a4f911a7..7dd0ff9c7 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -9,11 +9,9 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key RUN \ - apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps curl && \ + apk add --no-cache ca-certificates 'curl>7.61.0' && \ echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ curl https://dl.minio.io/server/minio/release/linux-amd64/minio > /usr/bin/minio && \ - apk del .build-deps && \ chmod +x /usr/bin/minio && \ chmod +x /usr/bin/docker-entrypoint.sh && \ chmod +x /usr/bin/healthcheck.sh