Rename *_env -> *.env

This commit is contained in:
Patrick Jentsch 2019-09-06 13:11:32 +02:00
parent a6fc0c7826
commit 444e1221df
5 changed files with 21 additions and 5 deletions

View File

@ -7,8 +7,8 @@ services:
- opaque_database - opaque_database
- opaque_redis - opaque_redis
env_file: env_file:
- opaque_database_env - opaque_database.env
- opaque_env - opaque.env
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque:development image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque:development
ports: ports:
- 5000:5000 - 5000:5000
@ -19,15 +19,14 @@ services:
container_name: opaque_daemon container_name: opaque_daemon
depends_on: depends_on:
- opaque_database - opaque_database
env_file: env_file: opaque_database.env
- 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: opaque_database:
container_name: opaque_database 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:

14
opaque.env Normal file
View File

@ -0,0 +1,14 @@
### Flask ###
FLASK_CONFIG=development
# SECRET_KEY=
### Flask-Mail ###
MAIL_SERVER=smtp.gmail.com
MAIL_PORT=587
MAIL_USE_TLS=true
MAIL_USERNAME=dev.opaque@gmail.com
MAIL_PASSWORD=Opaque-dev1
MAIL_DEFAULT_SENDER=dev.opaque@gmail.com
### Opaque ###
OPAQUE_ADMIN=p.jentsch@uni-bielefeld.de

3
opaque_database.env.tpl Normal file
View File

@ -0,0 +1,3 @@
POSTGRES_DB_NAME=opaque
POSTGRES_USER=opaque
POSTGRES_PASSWORD=opaque