sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-24 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Rename services in compose.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-09-06 13:42:47 +02:00
parent 444e1221df
commit 25cb960198
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.py
View File

@ -30,7 +30,7 @@ class DevelopmentConfig(Config):
DEBUG = True DEBUG = True
''' ### Flask-SQLAlchemy ### ''' ''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@opaque_database/{}'.format( SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@db/{}'.format(
os.environ.get('POSTGRES_USER'), os.environ.get('POSTGRES_USER'),
os.environ.get('POSTGRES_PASSWORD'), os.environ.get('POSTGRES_PASSWORD'),
os.environ.get('POSTGRES_DB_NAME') os.environ.get('POSTGRES_DB_NAME')
@ -50,7 +50,7 @@ class TestingConfig(Config):
class ProductionConfig(Config): class ProductionConfig(Config):
''' ### Flask-SQLAlchemy ### ''' ''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@opaque_database/{}'.format( SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@db/{}'.format(
os.environ.get('POSTGRES_USER'), os.environ.get('POSTGRES_USER'),
os.environ.get('POSTGRES_PASSWORD'), os.environ.get('POSTGRES_PASSWORD'),
os.environ.get('POSTGRES_DB_NAME') os.environ.get('POSTGRES_DB_NAME')

18
docker-compose.yml
View File

@ -1,11 +1,10 @@
version: '3' version: '3'
services: services:
opaque: web:
container_name: opaque
depends_on: depends_on:
- opaque_database - db
- opaque_redis - redis
env_file: env_file:
- opaque_database.env - opaque_database.env
- opaque.env - opaque.env
@ -15,23 +14,20 @@ services:
restart: always restart: always
volumes: volumes:
- /opaque_storage:/opaque_storage - /opaque_storage:/opaque_storage
opaque_daemon: daemon:
container_name: opaque_daemon
depends_on: depends_on:
- opaque_database - db
env_file: opaque_database.env env_file: opaque_database.env
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
restart: always restart: always
volumes: volumes:
- $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json - $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
opaque_database: db:
container_name: opaque_database
env_file: opaque_database.env env_file: opaque_database.env
image: postgres:alpine image: postgres:alpine
restart: always restart: always
volumes: volumes:
- /opaque_database:/var/lib/postgresql/data - /opaque_database:/var/lib/postgresql/data
opaque_redis: redis:
container_name: opaque_redis
image: redis:alpine image: redis:alpine
restart: always restart: always