Skip to content

Commit af039b4

Browse files
committed
Resolved docker image cacerts by moving out of builder stage
1 parent 79cacf4 commit af039b4

File tree

4 files changed

+6
-3452
lines changed

4 files changed

+6
-3452
lines changed

Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ RUN pip install awscli
4747
RUN chmod +x /usr/local/bin/* && \
4848
upx --lzma /usr/local/bin/*
4949

50-
51-
RUN mkdir -p /home/certs/curl
52-
COPY /certs/curl/cacert.pem /home/certs/curl/
53-
5450
WORKDIR tmp/commit0
5551
COPY . .
5652

@@ -61,16 +57,15 @@ RUN make build-deps && make build && \
6157
FROM alpine:3.10
6258
ENV \
6359
PROTOBUF_VERSION=3.6.1-r1 \
64-
GOPATH=/proto-libs \
65-
CURL_CA_BUNDLE=/home/certs/curl/cacert.pem \
66-
SSL_CERT_DIR=/home/certs/curl \
67-
SSL_CERT_FILE=cacert.pem
60+
GOPATH=/proto-libs
61+
62+
RUN apk add --update bash ca-certificates git python && \
63+
apk add --update -t deps make py-pip
6864

6965
RUN mkdir ${GOPATH}
7066
COPY --from=builder /usr/local/bin /usr/local/bin
7167
COPY --from=builder /usr/local/include /usr/local/include
7268
COPY --from=builder /go/src/github.com/grpc-ecosystem/grpc-gateway ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway
73-
COPY --from=builder /home/certs/curl /home/certs/curl
7469
WORKDIR /project
7570
RUN apk add --update --no-cache make protobuf=${PROTOBUF_VERSION} && \
7671
rm -rf /var/cache/apk/*

certs/curl/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)