Fix some config issues for docker-compose

This commit is contained in:
Sylvain Bellemare 2016-02-11 22:22:48 +01:00
parent 02d941d333
commit e15d4ce39c
5 changed files with 31 additions and 5 deletions

9
.dockerignore Normal file
View File

@ -0,0 +1,9 @@
.cache/
.coverage
.eggs/
.git/
.gitignore
.ropeproject/
.travis.yml
BigchainDB.egg-info/
dist/

View File

@ -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]

View File

@ -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

View File

@ -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

View File

@ -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,
},
)