merge

.ci/travis-before-install.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sudo apt-get update
+sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+
+sudo rm /usr/local/bin/docker-compose
+curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+chmod +x docker-compose
+sudo mv docker-compose /usr/local/bin

.ci/travis-before-script.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e -x
+
+docker-compose up -d bigchaindb

.ci/travis-install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e -x
+
+docker-compose build --no-cache bigchaindb js-bigchaindb-driver

.ci/travis_script.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e -x
+
+docker-compose run --rm js-bigchaindb-driver yarn test

.travis.yml

@@ -5,23 +5,24 @@ services:
 
 language: node_js
 
-node_js: 7
-
 cache:
     directories:
         - node_modules
 
+env:
+  global:
+    - DOCKER_COMPOSE_VERSION=1.19.0
+
 before_install:
-    - docker run -d -p 27017:27017 mongo:3.4 --replSet=bigchain-rs
+  - .ci/travis-before-install
-    - docker run -d -p 9984:9984
+
-      -e BIGCHAINDB_KEYPAIR_PUBLIC=8wHUvvraRo5yEoJAt66UTZaFq9YZ9tFFwcauKPDtjkGw
+install:
-      -e BIGCHAINDB_KEYPAIR_PRIVATE=5C5Cknco7YxBRP9AgB1cbUVTL4FAcooxErLygw1DeG2D
+  - .ci/travis-install.sh
-      -e BIGCHAINDB_DATABASE_BACKEND=mongodb
+
-      -e BIGCHAINDB_DATABASE_HOST=172.17.0.1
+before_script:
-      bigchaindb/bigchaindb:master
+  - .ci/travis-before-script.sh
-      start
+  - gem install cowsay
-    - gem install cowsay
+  - npm install -g codecov
-    - npm install -g codecov
 
 script: yarn test
 

compose/tendermint/tmdata/config.toml

@@ -0,0 +1,17 @@
+# This is a TOML config file.
+# For more information, see https://github.com/toml-lang/toml
+
+proxy_app = "tcp://bigchaindb:46658"
+moniker = "anonymous"
+fast_sync = true
+db_backend = "leveldb"
+log_level = "state:debug,*:error"
+
+[consensus]
+create_empty_blocks = false
+
+[rpc]
+laddr = "tcp://0.0.0.0:46657"
+
+[p2p]
+laddr = "tcp://0.0.0.0:46656"

docker-compose.yml

@@ -10,12 +10,7 @@ services:
     depends_on:
       - mongodb
       - tendermint
-    build:
+    image: bigchaindb/bigchaindb:master
-      context: .
-      dockerfile: ./compose/Dockerfile
-      args:
-        branch: master
-        backend: localmongodb
     environment:
       BIGCHAINDB_DATABASE_HOST: mongodb
       BIGCHAINDB_DATABASE_PORT: 27017
@@ -24,15 +19,15 @@ services:
       BIGCHAINDB_TENDERMINT_HOST: tendermint
       BIGCHAINDB_TENDERMINT_PORT: 46657
     ports:
-      - "9984"
+      - "9984:9984"
-      - "9985"
+      - "9985:9985"
       - "46658"
     healthcheck:
       test: ["CMD", "bash", "-c", "curl http://bigchaindb:9984 && curl http://tendermint:46657/abci_query"]
       interval: 3s
       timeout: 5s
       retries: 3
-    command: bigchaindb -l DEBUG start
+    command: -l DEBUG start
   tendermint:
     image: tendermint/tendermint:0.12
     volumes: