diff --git a/DOCKER/README.md b/DOCKER/README.md index e765fc525..8e660b980 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -1,24 +1,20 @@ # Docker -Tendermint uses docker for deployment of testnets via the [mintnet](github.com/tendermint/mintnet) tool. - -For faster development iterations (ie. to avoid docker builds), -the dockerfile just sets up the OS, and tendermint is fetched/installed at runtime. +Tendermint uses docker for deployment of testnets via the [mintnet](github.com/tendermint/mintnet) tool. For the deterministic docker builds used in testing, see the [tests directory](https://github.com/tendermint/tendermint/tree/master/test) # Build and run a docker image and container -These are notes for the dev team. +These are notes for the dev team. ``` # Build base Docker image -# Make sure ./run.sh exists. -docker build -t tendermint/tmbase -f Dockerfile . +docker build -t "tendermint/tendermint" -t "tendermint/tendermint:0.8.0" -t "tendermint/tendermint:0.8" . # Log into dockerhub docker login # Push latest build to dockerhub -docker push tendermint/tmbase +docker push tendermint/tendermint ``` diff --git a/test/net/start.sh b/test/net/start.sh index 1980280d1..9e9ea3a0d 100644 --- a/test/net/start.sh +++ b/test/net/start.sh @@ -17,18 +17,13 @@ if [[ "$MACH_PREFIX" == "" ]]; then fi set -u -export TMHEAD=`git rev-parse --abbrev-ref HEAD` -export TM_IMAGE="tendermint/tmbase" - -cd $GOPATH/src/github.com/tendermint/network_testing +cd "$GOPATH/src/github.com/tendermint/network_testing" echo "... running network test $(pwd)" -bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $NTXS $MACH_PREFIX $RESULTSDIR $CLOUD_PROVIDER +TMHEAD=$(git rev-parse --abbrev-ref HEAD) TM_IMAGE="tendermint/tendermint" bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $NTXS $MACH_PREFIX $RESULTSDIR $CLOUD_PROVIDER # TODO: publish result! # cleanup echo "... destroying machines" -mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE] - - +mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE]