From 433225ab0d7851c6318634550e54f8d0f82cbd0d Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 7 Mar 2017 16:30:19 -0800 Subject: [PATCH] docker: ca-certificates should not be removed. (#3868) --- .travis.yml | 2 +- Dockerfile | 3 ++- Dockerfile.armhf | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d50d7dbd..18f017918 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ script: # push image - > - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$ARCH" == "x86_64" ]; then docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" docker push minio/minio:edge-armhf fi diff --git a/Dockerfile b/Dockerfile index 764b99821..4dbfc540c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,8 @@ ENV CGO_ENABLED 0 WORKDIR /go/src/github.com/minio/ RUN \ - apk add --no-cache --virtual .build-deps git go musl-dev ca-certificates && \ + apk add --no-cache ca-certificates && \ + apk add --no-cache --virtual .build-deps git go musl-dev && \ 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 9a59d73b4..6fab9a5ce 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -7,7 +7,8 @@ ENV CGO_ENABLED 0 WORKDIR /go/src/github.com/minio/ RUN \ - apk add --no-cache --virtual .build-deps git go musl-dev ca-certificates && \ + apk add --no-cache ca-certificates && \ + apk add --no-cache --virtual .build-deps git go musl-dev && \ 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)" && \