Merge pull request #383 from tendermint/feature/rename-dockerimage-to-tendermint
Rename docker image to tendermint
This commit is contained in:
commit
d545ac4c51
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
Tendermint uses docker for deployment of testnets via the [mintnet](github.com/tendermint/mintnet) tool.
|
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.
|
|
||||||
|
|
||||||
For the deterministic docker builds used in testing, see the [tests directory](https://github.com/tendermint/tendermint/tree/master/test)
|
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
|
# Build and run a docker image and container
|
||||||
|
@ -13,12 +10,11 @@ These are notes for the dev team.
|
||||||
|
|
||||||
```
|
```
|
||||||
# Build base Docker image
|
# Build base Docker image
|
||||||
# Make sure ./run.sh exists.
|
docker build -t "tendermint/tendermint" -t "tendermint/tendermint:0.8.0" -t "tendermint/tendermint:0.8" .
|
||||||
docker build -t tendermint/tmbase -f Dockerfile .
|
|
||||||
|
|
||||||
# Log into dockerhub
|
# Log into dockerhub
|
||||||
docker login
|
docker login
|
||||||
|
|
||||||
# Push latest build to dockerhub
|
# Push latest build to dockerhub
|
||||||
docker push tendermint/tmbase
|
docker push tendermint/tendermint
|
||||||
```
|
```
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -20,18 +20,18 @@ build_race:
|
||||||
dist:
|
dist:
|
||||||
@BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/dist.sh'"
|
@BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/dist.sh'"
|
||||||
|
|
||||||
test: build
|
test:
|
||||||
@echo "--> Running go test"
|
@echo "--> Running go test"
|
||||||
@go test $(PACKAGES)
|
@go test $(PACKAGES)
|
||||||
|
|
||||||
test_race: build
|
test_race:
|
||||||
@echo "--> Running go test --race"
|
@echo "--> Running go test --race"
|
||||||
@go test -race $(PACKAGES)
|
@go test -race $(PACKAGES)
|
||||||
|
|
||||||
test_integrations:
|
test_integrations:
|
||||||
@bash ./test/test.sh
|
@bash ./test/test.sh
|
||||||
|
|
||||||
test100: build
|
test100:
|
||||||
@for i in {1..100}; do make test; done
|
@for i in {1..100}; do make test; done
|
||||||
|
|
||||||
draw_deps:
|
draw_deps:
|
||||||
|
|
|
@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
|
||||||
wget -qO- https://get.docker.com/ | sh
|
wget -qO- https://get.docker.com/ | sh
|
||||||
usermod -a -G docker vagrant
|
usermod -a -G docker vagrant
|
||||||
|
|
||||||
curl -O https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
|
curl -O https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz
|
||||||
tar -xvf go1.7.linux-amd64.tar.gz
|
tar -xvf go1.7.linux-amd64.tar.gz
|
||||||
mv go /usr/local
|
mv go /usr/local
|
||||||
echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile
|
echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile
|
||||||
|
@ -28,6 +28,6 @@ Vagrant.configure("2") do |config|
|
||||||
ln -s /vagrant /home/vagrant/go/src/github.com/tendermint/tendermint
|
ln -s /vagrant /home/vagrant/go/src/github.com/tendermint/tendermint
|
||||||
|
|
||||||
su - vagrant -c 'curl https://glide.sh/get | sh'
|
su - vagrant -c 'curl https://glide.sh/get | sh'
|
||||||
su - vagrant -c 'cd /vagrant/ && glide install && make test'
|
su - vagrant -c 'cd /vagrant/ && make get_vendor_deps && make test'
|
||||||
SHELL
|
SHELL
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,12 +17,9 @@ if [[ "$MACH_PREFIX" == "" ]]; then
|
||||||
fi
|
fi
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
export TMHEAD=`git rev-parse --abbrev-ref HEAD`
|
cd "$GOPATH/src/github.com/tendermint/network_testing"
|
||||||
export TM_IMAGE="tendermint/tmbase"
|
|
||||||
|
|
||||||
cd $GOPATH/src/github.com/tendermint/network_testing
|
|
||||||
echo "... running network test $(pwd)"
|
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!
|
# TODO: publish result!
|
||||||
|
|
||||||
|
@ -30,5 +27,3 @@ bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $
|
||||||
|
|
||||||
echo "... destroying machines"
|
echo "... destroying machines"
|
||||||
mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE]
|
mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE]
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue