Merge branch 'docker-dev' of git://github.com/sbellem/bigchaindb into sbellem-docker-dev

Dockerfile-dev

@@ -0,0 +1,12 @@
+FROM python:3.5
+
+RUN apt-get update
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+RUN pip install --upgrade pip
+
+COPY . /usr/src/app/
+
+RUN pip install --no-cache-dir -e .[dev]

bigchaindb/__init__.py

@@ -1,4 +1,5 @@
 import copy
+import os
 
 # from functools import reduce
 # PORT_NUMBER = reduce(lambda x, y: x * y, map(ord, 'BigchainDB')) % 2**16
@@ -14,7 +15,7 @@ config = {
         'threads': None, # if none, the value will be cpu_count * 2 + 1
     },
     'database': {
-        'host': 'localhost',
+        'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'),
         'port': 28015,
         'name': 'bigchain',
     },

docker-compose.yml

@@ -1,31 +1,34 @@
-rethinkdb:
-  image: rethinkdb
-  ports:
-    - "58080:8080"
-    - "28015"
-  volumes_from:
-    - rethinkdb-data
+version: '2'
 
-rethinkdb-data:
-  image: rethinkdb
-  volumes:
-    - /data
-  command: "true"
+services:
+  rdb:
+    image: rethinkdb
+    ports:
+      - "58080:8080"
+      - "28015"
+    volumes_from:
+      - rdb-data
 
-bigchaindb:
-  build: .
-  container_name: docker-bigchaindb
-  volumes:
-    - ./bigchaindb:/usr/src/app/bigchaindb
-    - ./tests:/usr/src/app/tests
-    - ./docs:/usr/src/app/docs
-    - ./setup.py:/usr/src/app/setup.py
-    - ./setup.cfg:/usr/src/app/setup.cfg
-    - ./pytest.ini:/usr/src/app/pytest.ini
-    - ~/.bigchaindb_docker:/root/.bigchaindb_docker
-  links:
-    - rethinkdb
-  environment:
-    BIGCHAIN_DATABASE_HOST: rethinkdb
-    BIGCHAINDB_CONFIG_PATH: /root/.bigchaindb_docker/config
-  command: bigchaindb start
+  rdb-data:
+    image: rethinkdb
+    volumes:
+      - /data
+    command: "true"
+
+  bdb:
+    build:
+      context: .
+      dockerfile: Dockerfile-dev
+    container_name: docker-bigchaindb
+    volumes:
+      - ./bigchaindb:/usr/src/app/bigchaindb
+      - ./tests:/usr/src/app/tests
+      - ./docs:/usr/src/app/docs
+      - ./setup.py:/usr/src/app/setup.py
+      - ./setup.cfg:/usr/src/app/setup.cfg
+      - ./pytest.ini:/usr/src/app/pytest.ini
+      - ~/.bigchaindb_docker:/root/.bigchaindb_docker
+    environment:
+      BIGCHAINDB_DATABASE_HOST: rdb
+      BIGCHAINDB_CONFIG_PATH: /root/.bigchaindb_docker/config
+    command: bigchaindb start

docs/source/running-unit-tests.md

@@ -18,3 +18,19 @@ $ python setup.py test
 
 (Aside: How does the above command work? The documentation for [pytest-runner](https://pypi.python.org/pypi/pytest-runner) explains. We use [pytest](http://pytest.org/latest/) to write all unit tests.)
 
+
+### Using docker-compose to Run the Tests
+
+You can also use `docker-compose` to run the unit tests.
+
+Start `RethinkDB` in the background:
+
+```text
+$ docker-compose up -d rdb
+```
+
+then run the unit tests using:
+
+```text
+$ docker-compose run --rm bdb py.test -v
+```