Merge branch 'master' into greenkeeper/webpack-4.16.1

This commit is contained in:
manolodewiner 2018-07-17 11:31:50 +02:00
commit 4a38192f76
1 changed files with 10 additions and 10 deletions

View File

@ -2,7 +2,7 @@ version: '2.1'
services:
mongodb:
image: mongo:3.4.13
image: mongo:3.6
ports:
- "27017"
command: mongod
@ -17,23 +17,23 @@ services:
BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
BIGCHAINDB_WSSERVER_HOST: 0.0.0.0
BIGCHAINDB_TENDERMINT_HOST: tendermint
BIGCHAINDB_TENDERMINT_PORT: 46657
BIGCHAINDB_TENDERMINT_PORT: 26657
ports:
- "9984:9984"
- "9985:9985"
- "46658"
- "26658"
healthcheck:
test: ["CMD", "bash", "-c", "curl http://bigchaindb:9984 && curl http://tendermint:46657/abci_query"]
test: ["CMD", "bash", "-c", "curl http://bigchaindb:9984 && curl http://tendermint:26657/abci_query"]
interval: 3s
timeout: 5s
retries: 3
command: -l DEBUG start
tendermint:
image: tendermint/tendermint:0.19.2
volumes:
- ./compose/tendermint/tmdata/config.toml:/tendermint/config.toml
image: tendermint/tendermint:0.22.3
# volumes:
# - ./tmdata:/tendermint
entrypoint: ''
ports:
- "46656"
- "46657"
command: sh -c "tendermint init && tendermint node --consensus.create_empty_blocks=false --proxy_app=tcp://bigchaindb:46658"
- "26656"
- "26657"
command: sh -c "tendermint init && tendermint node --consensus.create_empty_blocks=false --proxy_app=tcp://bigchaindb:26658"