From d7fee348051d8c773f65dff495392ad9c868cd2b Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Thu, 27 Dec 2018 21:03:13 +0800 Subject: Dockerfile: clean bls before build (#109) --- Dockerfile | 6 +++--- Makefile | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7d8668636..43dea93ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ # Build Geth in a stock Go builder container FROM golang:1.11-alpine as builder -RUN apk add --no-cache make gcc musl-dev linux-headers g++ gmp-dev openssl-dev +RUN apk add --no-cache make gcc musl-dev linux-headers g++ gmp-dev openssl-dev pkgconfig ADD . /dexon -RUN cd /dexon && DOCKER=alpine make gdex +RUN cd /dexon && make clean && DOCKER=alpine make gdex # Pull Geth into a second stage deploy alpine container FROM alpine:latest -RUN apk add --no-cache ca-certificates libstdc++ +RUN apk add --no-cache ca-certificates libstdc++ curl gmp openssl COPY --from=builder /dexon/build/bin/gdex /usr/local/bin/ EXPOSE 8545 8546 30303 30303/udp diff --git a/Makefile b/Makefile index 252a5bb0d..9f8347140 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,8 @@ libbls: clean: ./build/clean_go_build_cache.sh rm -fr build/_workspace/pkg/ $(GOBIN)/* + make -C vendor/github.com/dexon-foundation/bls clean + make -C vendor/github.com/dexon-foundation/mcl clean # The devtools target installs tools required for 'go generate'. # You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'. -- cgit v1.2.3