diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..dfd6a8ca --- /dev/null +++ b/.dockerignore @@ -0,0 +1,9 @@ +.cache/ +.coverage +.eggs/ +.git/ +.gitignore +.ropeproject/ +.travis.yml +BigchainDB.egg-info/ +dist/ diff --git a/Dockerfile b/Dockerfile index 6ab83528..a955dd5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app RUN pip install --upgrade pip -RUN pip install --no-cache-dir pytest pytest-cov COPY . /usr/src/app/ -RUN python setup.py develop +RUN pip install --no-cache-dir -e .[dev] diff --git a/bigchaindb/config_utils.py b/bigchaindb/config_utils.py index 3c6139f6..bf3ed529 100644 --- a/bigchaindb/config_utils.py +++ b/bigchaindb/config_utils.py @@ -20,7 +20,10 @@ import collections import bigchaindb logger = logging.getLogger(__name__) -CONFIG_DEFAULT_PATH = os.path.join(os.path.expanduser('~'), '.bigchaindb') +CONFIG_DEFAULT_PATH = os.environ.setdefault( + 'BIGCHAINDB_CONFIG_PATH', + os.path.join(os.path.expanduser('~'), '.bigchaindb'), +) # Thanks Alex <3 diff --git a/docker-compose.yml b/docker-compose.yml index c5679e8c..fb9727a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,9 +15,16 @@ rethinkdb-data: bigchaindb: build: . volumes: - - ./:/usr/src/app/ + - ./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 diff --git a/setup.py b/setup.py index e4877648..32922405 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,11 @@ tests_require = [ 'pytest-cov', ] +dev_require = [ + 'ipdb', + 'ipython', +] + setup( name='BigchainDB', version='0.1.2', @@ -56,5 +61,8 @@ setup( ], setup_requires=['pytest-runner'], tests_require=tests_require, - extras_require={'test': tests_require}, + extras_require={ + 'test': tests_require, + 'dev': dev_require + tests_require, + }, )