From 595fc24c568d7acbc9ff73d4e9c94d866fd12282 Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Fri, 18 May 2018 13:22:04 -0400 Subject: [PATCH 1/4] remove very old bash file --- Makefile | 2 +- test/docker/update.sh | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 test/docker/update.sh diff --git a/Makefile b/Makefile index 05d1889f..60a81fe3 100755 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ sentry-start: cd networks/remote/terraform && terraform init && terraform apply -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_KEY_FILE="$(HOME)/.ssh/id_rsa.pub" @if ! [ -f $(CURDIR)/build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/tendermint:Z tendermint/localnode testnet --v 0 --n 4 --o . ; fi cd networks/remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l sentrynet install.yml - @echo "Next step: Add your validator setup in the genesis.json and config.tml files and run \"make server-config\". (Public key of validator, chain ID, peer IP and node ID.)" + @echo "Next step: Add your validator setup in the genesis.json and config.tml files and run \"make sentry-config\". (Public key of validator, chain ID, peer IP and node ID.)" # Configuration management sentry-config: diff --git a/test/docker/update.sh b/test/docker/update.sh deleted file mode 100644 index b946bf39..00000000 --- a/test/docker/update.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash - -# update the `tester` image by copying in the latest tendermint binary - -docker run --name builder tester true -docker cp $GOPATH/bin/tendermint builder:/go/bin/tendermint -docker commit builder tester -docker rm -vf builder - From ca120798e448abf578123fe80411813193d0650a Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Fri, 18 May 2018 13:26:26 -0400 Subject: [PATCH 2/4] s/dummy/kvstore/g for compatibility (#1532) --- networks/local/localnode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networks/local/localnode/Dockerfile b/networks/local/localnode/Dockerfile index c4556caa..3c9ddf54 100644 --- a/networks/local/localnode/Dockerfile +++ b/networks/local/localnode/Dockerfile @@ -9,7 +9,7 @@ VOLUME [ /tendermint ] WORKDIR /tendermint EXPOSE 46656 46657 ENTRYPOINT ["/usr/bin/wrapper.sh"] -CMD ["node", "--proxy_app", "dummy"] +CMD ["node", "--proxy_app", "kvstore"] STOPSIGNAL SIGTERM COPY wrapper.sh /usr/bin/wrapper.sh From 0b68ec4b8ec7586a1c79ce5265790f8bfc2ad672 Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Fri, 18 May 2018 13:37:58 -0400 Subject: [PATCH 3/4] move a file to remove a directory --- .circleci/config.yml | 2 +- test/{circleci/p2p.sh => p2p/circleci.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/{circleci/p2p.sh => p2p/circleci.sh} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8dac95a8..177c1458 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ jobs: - checkout - run: mkdir -p $GOPATH/src/github.com/tendermint - run: ln -sf /home/circleci/project $GOPATH/src/github.com/tendermint/tendermint - - run: bash test/circleci/p2p.sh + - run: bash test/p2p/circleci.sh upload_coverage: <<: *defaults diff --git a/test/circleci/p2p.sh b/test/p2p/circleci.sh similarity index 100% rename from test/circleci/p2p.sh rename to test/p2p/circleci.sh From 0e1f730fbbeb706825763b7b55d73a3b15a1bc64 Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Fri, 18 May 2018 13:59:30 -0400 Subject: [PATCH 4/4] rm unused file, fix docker-compose.yml --- docker-compose.yml | 16 ++++++++-------- test/p2p/clean.sh | 5 ----- 2 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 test/p2p/clean.sh diff --git a/docker-compose.yml b/docker-compose.yml index b9a3fc68..ebbd5062 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,9 +8,9 @@ services: - "46656-46657:46656-46657" environment: - ID=0 - - LOG=${LOG:-tendermint.log} + - LOG=$${LOG:-tendermint.log} volumes: - - ${FOLDER:-./build}:/tendermint:Z + - ./build:/tendermint:Z networks: localnet: ipv4_address: 192.167.10.2 @@ -22,9 +22,9 @@ services: - "46659-46660:46656-46657" environment: - ID=1 - - LOG=${LOG:-tendermint.log} + - LOG=$${LOG:-tendermint.log} volumes: - - ${FOLDER:-./build}:/tendermint:Z + - ./build:/tendermint:Z networks: localnet: ipv4_address: 192.167.10.3 @@ -34,11 +34,11 @@ services: image: "tendermint/localnode" environment: - ID=2 - - LOG=${LOG:-tendermint.log} + - LOG=$${LOG:-tendermint.log} ports: - "46661-46662:46656-46657" volumes: - - ${FOLDER:-./build}:/tendermint:Z + - ./build:/tendermint:Z networks: localnet: ipv4_address: 192.167.10.4 @@ -48,11 +48,11 @@ services: image: "tendermint/localnode" environment: - ID=3 - - LOG=${LOG:-tendermint.log} + - LOG=$${LOG:-tendermint.log} ports: - "46663-46664:46656-46657" volumes: - - ${FOLDER:-./build}:/tendermint:Z + - ./build:/tendermint:Z networks: localnet: ipv4_address: 192.167.10.5 diff --git a/test/p2p/clean.sh b/test/p2p/clean.sh deleted file mode 100644 index 44a1276e..00000000 --- a/test/p2p/clean.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/bash - -# clean everything -docker rm -vf $(docker ps -aq) -docker network rm local_testnet