From ff244e8ad158a715ca7c9a0437124a6fae87bfa7 Mon Sep 17 00:00:00 2001 From: araskachoi Date: Tue, 21 Jul 2020 12:54:58 -0700 Subject: [PATCH 1/5] fix errors and make testnet work --- Dockerfile | 8 +++----- Makefile | 6 +++--- docker-compose.yml | 16 ++++++++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce86afdf5..a856b7939 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,9 @@ COPY . . RUN make build-ethermint-linux # Final image -FROM alpine:edge +FROM golang:1.13 as final -# Install ca-certificates -RUN apk add --update ca-certificates -WORKDIR /root +RUN apt-get update # Copy over binaries from the build-env COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/build/emintd /usr/bin/emintd @@ -28,4 +26,4 @@ COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/build/emintcli /usr EXPOSE 26656 26657 1317 # Run emintd by default, omit entrypoint to ease using container with emintcli -CMD ["emintd"] +ENTRYPOINT ["/bin/bash"] diff --git a/Makefile b/Makefile index 286eae06e..481289544 100644 --- a/Makefile +++ b/Makefile @@ -268,9 +268,9 @@ localnet-start: localnet-stop docker rmi -f ethermint-build-linux docker build --rm -t ethermint-build-linux . ; \ container_id=$$(docker create ethermint-build-linux) ; \ - docker cp $${container_id}:/usr/bin/emintd ./build/ ; \ - docker cp $${container_id}:/usr/bin/emintcli ./build/ - if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/$(ETHERMINT_DAEMON_BINARY):Z emintd/node testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi + docker container start $${container_id} ; \ + + if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/ethermint-build-linux:Z ethermint-build-linux -l -c emintd testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi docker-compose up -d localnet-stop: diff --git a/docker-compose.yml b/docker-compose.yml index e0e49b37f..4d8f0d239 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: emintdnode0: container_name: emintdnode0 - image: "emintd/node" + image: "ethermint-build-linux" ports: - "26656-26657:26656-26657" - "1317:1317" @@ -11,14 +11,14 @@ services: - ID=0 - LOG=${LOG:-emintd.log} volumes: - - ./build:/emintd:Z + - ./build:/ethermint-build-linux:Z networks: localnet: ipv4_address: 192.168.10.2 emintdnode1: container_name: emintdnode1 - image: "emintd/node" + image: "ethermint-build-linux" ports: - "26659-26660:26656-26657" - "1318:1317" @@ -26,14 +26,14 @@ services: - ID=1 - LOG=${LOG:-emintd.log} volumes: - - ./build:/emintd:Z + - ./build:/ethermint-build-linux:Z networks: localnet: ipv4_address: 192.168.10.3 emintdnode2: container_name: emintdnode2 - image: "emintd/node" + image: "ethermint-build-linux" environment: - ID=2 - LOG=${LOG:-emintd.log} @@ -41,14 +41,14 @@ services: - "26661-26662:26656-26657" - "1319:1317" volumes: - - ./build:/emintd:Z + - ./build:/ethermint-build-linux:Z networks: localnet: ipv4_address: 192.168.10.4 emintdnode3: container_name: emintdnode3 - image: "emintd/node" + image: "ethermint-build-linux" environment: - ID=3 - LOG=${LOG:-emintd.log} @@ -56,7 +56,7 @@ services: - "26663-26664:26656-26657" - "1320:1317" volumes: - - ./build:/emintd:Z + - ./build:/ethermint-build-linux:Z networks: localnet: ipv4_address: 192.168.10.5 From dc2a24d06a5d7235c6df68b9e6d12c17c07d2558 Mon Sep 17 00:00:00 2001 From: Daniel Choi Date: Wed, 22 Jul 2020 08:46:13 -0700 Subject: [PATCH 2/5] Update Dockerfile Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a856b7939..c0619b480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY . . RUN make build-ethermint-linux # Final image -FROM golang:1.13 as final +FROM golang:1.14 as final RUN apt-get update From 5123cc31a4212a8df4e4ab2d677a4783253ba698 Mon Sep 17 00:00:00 2001 From: araskachoi Date: Wed, 22 Jul 2020 16:33:13 -0700 Subject: [PATCH 3/5] wip - fix db --- Dockerfile | 4 +++- Makefile | 4 ++-- docker-compose.yml | 12 ++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c0619b480..e156673d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ RUN make build-ethermint-linux # Final image FROM golang:1.14 as final +WORKDIR / + RUN apt-get update # Copy over binaries from the build-env @@ -26,4 +28,4 @@ COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/build/emintcli /usr EXPOSE 26656 26657 1317 # Run emintd by default, omit entrypoint to ease using container with emintcli -ENTRYPOINT ["/bin/bash"] +ENTRYPOINT ["/bin/bash", "-c"] \ No newline at end of file diff --git a/Makefile b/Makefile index 481289544..c6872d202 100644 --- a/Makefile +++ b/Makefile @@ -268,9 +268,9 @@ localnet-start: localnet-stop docker rmi -f ethermint-build-linux docker build --rm -t ethermint-build-linux . ; \ container_id=$$(docker create ethermint-build-linux) ; \ - docker container start $${container_id} ; \ + docker container start $${container_id} ; - if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/ethermint-build-linux:Z ethermint-build-linux -l -c emintd testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi + if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/ethermint:Z ethermint-build-linux "emintd testnet --v 4 -o ethermint --starting-ip-address 192.168.10.2 --keyring-backend=test"; fi docker-compose up -d localnet-stop: diff --git a/docker-compose.yml b/docker-compose.yml index 4d8f0d239..6f0163fa9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,10 +11,11 @@ services: - ID=0 - LOG=${LOG:-emintd.log} volumes: - - ./build:/ethermint-build-linux:Z + - ./build:/ethermint:Z networks: localnet: ipv4_address: 192.168.10.2 + entrypoint: "emintd --home ethermint/node0/emintd/config/ start" emintdnode1: container_name: emintdnode1 @@ -26,10 +27,11 @@ services: - ID=1 - LOG=${LOG:-emintd.log} volumes: - - ./build:/ethermint-build-linux:Z + - ./build:/ethermint:Z networks: localnet: ipv4_address: 192.168.10.3 + entrypoint: "emintd --home ethermint/node0/emintd/config/ start" emintdnode2: container_name: emintdnode2 @@ -41,10 +43,11 @@ services: - "26661-26662:26656-26657" - "1319:1317" volumes: - - ./build:/ethermint-build-linux:Z + - ./build:/ethermint:Z networks: localnet: ipv4_address: 192.168.10.4 + entrypoint: "emintd --home ethermint/node0/emintd/config/ start" emintdnode3: container_name: emintdnode3 @@ -56,10 +59,11 @@ services: - "26663-26664:26656-26657" - "1320:1317" volumes: - - ./build:/ethermint-build-linux:Z + - ./build:/ethermint:Z networks: localnet: ipv4_address: 192.168.10.5 + entrypoint: "emintd --home ethermint/node0/emintd/config/ start" networks: localnet: From acb6f6c26c7c12bbd12a495df1129c376ae0f5cd Mon Sep 17 00:00:00 2001 From: araskachoi Date: Mon, 27 Jul 2020 13:27:33 -0700 Subject: [PATCH 4/5] fixes emintd nodes and syncs nodes --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f0163fa9..85a5cb5f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: networks: localnet: ipv4_address: 192.168.10.2 - entrypoint: "emintd --home ethermint/node0/emintd/config/ start" + entrypoint: "emintd --home ethermint/node0/emintd/ start" emintdnode1: container_name: emintdnode1 @@ -31,7 +31,7 @@ services: networks: localnet: ipv4_address: 192.168.10.3 - entrypoint: "emintd --home ethermint/node0/emintd/config/ start" + entrypoint: "emintd --home ethermint/node1/emintd/ start" emintdnode2: container_name: emintdnode2 @@ -47,7 +47,7 @@ services: networks: localnet: ipv4_address: 192.168.10.4 - entrypoint: "emintd --home ethermint/node0/emintd/config/ start" + entrypoint: "emintd --home ethermint/node2/emintd/ start" emintdnode3: container_name: emintdnode3 @@ -63,7 +63,7 @@ services: networks: localnet: ipv4_address: 192.168.10.5 - entrypoint: "emintd --home ethermint/node0/emintd/config/ start" + entrypoint: "emintd --home ethermint/node3/emintd/ start" networks: localnet: From 90f9ecc3232bc25b5d62067884657c2d83128012 Mon Sep 17 00:00:00 2001 From: araskachoi Date: Mon, 27 Jul 2020 13:28:58 -0700 Subject: [PATCH 5/5] starts daemon and rpc server in bg --- Dockerfile | 3 ++- Makefile | 2 +- docker-compose.yml | 4 ++++ scripts/start.sh | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 scripts/start.sh diff --git a/Dockerfile b/Dockerfile index e156673d6..451fcc817 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,9 @@ RUN apt-get update # Copy over binaries from the build-env COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/build/emintd /usr/bin/emintd COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/build/emintcli /usr/bin/emintcli +COPY --from=build-env /go/src/github.com/ChainSafe/ethermint/scripts/start.sh / -EXPOSE 26656 26657 1317 +EXPOSE 26656 26657 1317 8545 # Run emintd by default, omit entrypoint to ease using container with emintcli ENTRYPOINT ["/bin/bash", "-c"] \ No newline at end of file diff --git a/Makefile b/Makefile index c6872d202..17f767727 100644 --- a/Makefile +++ b/Makefile @@ -270,7 +270,7 @@ localnet-start: localnet-stop container_id=$$(docker create ethermint-build-linux) ; \ docker container start $${container_id} ; - if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/ethermint:Z ethermint-build-linux "emintd testnet --v 4 -o ethermint --starting-ip-address 192.168.10.2 --keyring-backend=test"; fi + if ! [ -f build/node0/$(ETHERMINT_DAEMON_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/ethermint:Z ethermint-build-linux "emintd testnet --v 4 -o /ethermint --starting-ip-address 192.168.10.2 --keyring-backend=test"; fi docker-compose up -d localnet-stop: diff --git a/docker-compose.yml b/docker-compose.yml index 85a5cb5f8..22363ed64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: ports: - "26656-26657:26656-26657" - "1317:1317" + - "8545:8545" environment: - ID=0 - LOG=${LOG:-emintd.log} @@ -23,6 +24,7 @@ services: ports: - "26659-26660:26656-26657" - "1318:1317" + - "8546:8545" environment: - ID=1 - LOG=${LOG:-emintd.log} @@ -42,6 +44,7 @@ services: ports: - "26661-26662:26656-26657" - "1319:1317" + - "8547:8545" volumes: - ./build:/ethermint:Z networks: @@ -58,6 +61,7 @@ services: ports: - "26663-26664:26656-26657" - "1320:1317" + - "8548:8545" volumes: - ./build:/ethermint:Z networks: diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100644 index 000000000..4eca5c744 --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,5 @@ +#!/bin/sh +emintd --home /ethermint/node$ID/emintd/ start > emintd.log & +sleep 5 +emintcli rest-server --laddr "tcp://localhost:8545" --chain-id 7305661614933169792 --trace > emintcli.log & +tail -f /dev/null \ No newline at end of file