Merge branch 'master' into greenkeeper/babel-eslint-8.2.6

docker-compose.yml

@@ -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
+    image: tendermint/tendermint:0.22.3
-    volumes:
+    # volumes:
-      - ./compose/tendermint/tmdata/config.toml:/tendermint/config.toml
+    #   - ./tmdata:/tendermint
     entrypoint: ''
     ports:
-      - "46656"
+      - "26656"
-      - "46657"
+      - "26657"
-    command: sh -c "tendermint init && tendermint node --consensus.create_empty_blocks=false --proxy_app=tcp://bigchaindb:46658"
+    command: sh -c "tendermint init && tendermint node --consensus.create_empty_blocks=false --proxy_app=tcp://bigchaindb:26658"

package.json

@@ -60,7 +60,7 @@
     "release-it": "^7.4.7",
     "rimraf": "^2.6.2",
     "sinon": "^6.1.0",
-    "webpack": "^4.15.0",
+    "webpack": "^4.16.1",
     "webpack-cli": "^3.0.8"
   },
   "dependencies": {