From 8d300570d0f935756f90cc31a04611687c56e15b Mon Sep 17 00:00:00 2001 From: GAEAlimited Date: Thu, 30 May 2024 11:29:57 -0400 Subject: [PATCH 1/2] master --- docker/mpcnode/Dockerfile | 21 +-------------------- docker/mpcnode/start-docker-mpcnode.sh | 1 + node/node.go | 1 + 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/docker/mpcnode/Dockerfile b/docker/mpcnode/Dockerfile index 04c78b4..f83b4ab 100644 --- a/docker/mpcnode/Dockerfile +++ b/docker/mpcnode/Dockerfile @@ -1,20 +1 @@ -# prepare -# 1st: make mpcnode; cp bin/cmd/mpcnode docker/mpcnode -# 2nd: cd docker/mpcnode -FROM ubuntu:18.04 -COPY mpcnode mpcnode-client /usr/local/bin/ -COPY ./entrypoint-mpcnode.sh / -RUN chmod +x /entrypoint-mpcnode.sh -ENTRYPOINT ["/entrypoint-mpcnode.sh"] - -##include 1st and 2nd -#FROM golang:1.13.5 AS builder -#WORKDIR /build -#COPY . . -#RUN make -# -#FROM ubuntu:18.04 -#COPY mpcnode mpcnode-client /usr/local/bin/ -#COPY ./entrypoint-mpcnode.sh / -#RUN chmod +x /entrypoint-mpcnode.sh -#ENTRYPOINT ["/entrypoint-mpcnode.sh"] +docker build -t mpcnode . diff --git a/docker/mpcnode/start-docker-mpcnode.sh b/docker/mpcnode/start-docker-mpcnode.sh index 3b37058..3216be6 100644 --- a/docker/mpcnode/start-docker-mpcnode.sh +++ b/docker/mpcnode/start-docker-mpcnode.sh @@ -1,2 +1,3 @@ docker run -d --name mpcnode --network host --restart always -v /var/lib/docker/mpcnode:/mpcnode anyswap/anympcnode +docker build -t mpcnode . docker exec mpcnode mpcnode-client --cmd ACCEPTREQADDR --url http://127.0.0.1:8449 --keystore keystore --passwd "123456" --key 0x... diff --git a/node/node.go b/node/node.go index fc9f943..d27e683 100644 --- a/node/node.go +++ b/node/node.go @@ -28,6 +28,7 @@ import ( "github.com/fsn-dev/dcrm-walletService/p2p" "github.com/fsn-dev/dcrm-walletService/p2p/event" + //"github.com/fsn-dev/dcrm-walletService/p2p/dcrm" //"github.com/fsn-dev/dcrm-walletService/p2p/dcrm" "github.com/fsn-dev/dcrm-walletService/rpc" From 11cfc1f8da804752a6e1e99b92f94c263856f56a Mon Sep 17 00:00:00 2001 From: GAEAlimited Date: Thu, 30 May 2024 11:30:28 -0400 Subject: [PATCH 2/2] master