From 4be3ffbe9b785bf7d1e002085c3967c68a3d2a67 Mon Sep 17 00:00:00 2001 From: Greg Szabo Date: Mon, 30 Apr 2018 18:22:03 -0400 Subject: [PATCH 1/2] Persistence test bash fix for relative folder path --- test/persist/test_failure_indices.sh | 2 +- test/{utils => persist}/txs.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/{utils => persist}/txs.sh (100%) diff --git a/test/persist/test_failure_indices.sh b/test/persist/test_failure_indices.sh index dd630e1b..f97cd718 100644 --- a/test/persist/test_failure_indices.sh +++ b/test/persist/test_failure_indices.sh @@ -82,7 +82,7 @@ for failIndex in $(seq $failsStart $failsEnd); do echo "* Test FailIndex $failIndex" # test failure at failIndex - bash ./test/utils/txs.sh "localhost:46657" & + bash $(dirname $0)/txs.sh "localhost:46657" & start_procs 1 "$failIndex" # tendermint should already have exited when it hits the fail index diff --git a/test/utils/txs.sh b/test/persist/txs.sh similarity index 100% rename from test/utils/txs.sh rename to test/persist/txs.sh From 4bca7c10090d00f9c1e20a8563c9026e6e871c49 Mon Sep 17 00:00:00 2001 From: Greg Szabo Date: Mon, 30 Apr 2018 21:43:02 -0400 Subject: [PATCH 2/2] Added tendermint/testing docker image description --- DOCKER/Dockerfile.testing | 18 ++++++++++++++++++ DOCKER/Makefile | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 DOCKER/Dockerfile.testing diff --git a/DOCKER/Dockerfile.testing b/DOCKER/Dockerfile.testing new file mode 100644 index 00000000..3e281dce --- /dev/null +++ b/DOCKER/Dockerfile.testing @@ -0,0 +1,18 @@ +FROM golang:1.10.1 + + +# Grab deps (jq, hexdump, xxd, killall) +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + jq bsdmainutils vim-common psmisc netcat + +# Add testing deps for curl +RUN echo 'deb http://httpredir.debian.org/debian testing main non-free contrib' >> /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends curl + +VOLUME /go + +EXPOSE 46656 +EXPOSE 46657 + diff --git a/DOCKER/Makefile b/DOCKER/Makefile index 10c97250..32510ebb 100644 --- a/DOCKER/Makefile +++ b/DOCKER/Makefile @@ -7,6 +7,9 @@ push: build_develop: docker build -t "tendermint/tendermint:develop" -f Dockerfile.develop . +build_testing: + docker build --tag tendermint/testing -f ./Dockerfile.testing . + push_develop: docker push "tendermint/tendermint:develop"