From 13c123d8474c325f4514e0ce9fc2b36adc292acc Mon Sep 17 00:00:00 2001 From: gmasgras Date: Thu, 14 Mar 2019 17:11:51 -0700 Subject: [PATCH] include required libs in faucet image --- Dockerfile.ci.faucet | 4 ++++ Dockerfile.faucet | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile.ci.faucet b/Dockerfile.ci.faucet index af9b295b46..fe8fea75bb 100644 --- a/Dockerfile.ci.faucet +++ b/Dockerfile.ci.faucet @@ -6,6 +6,10 @@ COPY faucet /usr/local/bin/faucet COPY --from=filecoin:all /tmp/su-exec/su-exec /sbin/su-exec COPY --from=filecoin:all /tmp/tini /sbin/tini COPY --from=filecoin:all /etc/ssl/certs /etc/ssl/certs +COPY --from=filecoin:all /lib/x86_64-linux-gnu/libutil.so.1 /lib/libutil.so.1 +COPY --from=filecoin:all /lib/x86_64-linux-gnu/libdl-2.24.so /lib/libdl.so.2 +COPY --from=filecoin:all /lib/x86_64-linux-gnu/librt.so.1 /lib/librt.so.1 +COPY --from=filecoin:all /lib/x86_64-linux-gnu/libgcc_s.so.1 /lib/libgcc_s.so.1 EXPOSE 9797 diff --git a/Dockerfile.faucet b/Dockerfile.faucet index c20b14758e..9e810d8906 100644 --- a/Dockerfile.faucet +++ b/Dockerfile.faucet @@ -1,7 +1,7 @@ FROM golang:1.11.2-stretch MAINTAINER Filecoin Dev Team -RUN apt-get update && apt-get install -y ca-certificates file sudo clang +RUN apt-get update && apt-get install -y ca-certificates file sudo clang jq RUN curl -sSf https://sh.rustup.rs | sh -s -- -y # This docker file is a modified version of @@ -9,6 +9,8 @@ RUN curl -sSf https://sh.rustup.rs | sh -s -- -y # Thanks Lars :) ENV SRC_DIR /go/src/github.com/filecoin-project/go-filecoin +ENV FILECOIN_USE_PRECOMPILED_RUST_PROOFS true +ENV FILECOIN_USE_PRECOMPILED_BLS_SIGNATURES true COPY . $SRC_DIR @@ -45,6 +47,10 @@ COPY --from=0 $SRC_DIR/faucet /usr/local/bin/faucet COPY --from=0 /tmp/su-exec/su-exec /sbin/su-exec COPY --from=0 /tmp/tini /sbin/tini COPY --from=0 /etc/ssl/certs /etc/ssl/certs +COPY --from=0 /lib/x86_64-linux-gnu/libutil.so.1 /lib/libutil.so.1 +COPY --from=0 /lib/x86_64-linux-gnu/libdl-2.24.so /lib/libdl.so.2 +COPY --from=0 /lib/x86_64-linux-gnu/librt.so.1 /lib/librt.so.1 +COPY --from=0 /lib/x86_64-linux-gnu/libgcc_s.so.1 /lib/libgcc_s.so.1 EXPOSE 9797