@@ -42,10 +42,10 @@ services:
4242 context : .
4343 target : test
4444 volumes :
45+ - ./config.docker.yml:/app/config.yml
4546 - ./syncmaster:/app/syncmaster
4647 - ./tests:/app/tests
4748 entrypoint : [python, -m, syncmaster.db.migrations, upgrade, head]
48- env_file : .env.docker
4949 depends_on :
5050 db :
5151 condition : service_healthy
@@ -57,10 +57,10 @@ services:
5757 dockerfile : docker/Dockerfile.server
5858 context : .
5959 target : test
60- env_file : .env.docker
6160 ports :
6261 - 8000:8000
6362 volumes :
63+ - ./config.docker.yml:/app/config.yml
6464 - ./syncmaster:/app/syncmaster
6565 - ./docs/_static:/app/docs/_static
6666 - ./reports:/app/reports
@@ -82,8 +82,8 @@ services:
8282 dockerfile : docker/Dockerfile.scheduler
8383 context : .
8484 target : test
85- env_file : .env.docker
8685 volumes :
86+ - ./config.docker.yml:/app/config.yml
8787 - ./syncmaster:/app/syncmaster
8888 - ./tests:/app/tests
8989 - ./reports:/app/reports
@@ -106,13 +106,12 @@ services:
106106 target : test
107107 command : --loglevel=info -Q 123-test_queue
108108 entrypoint : [coverage, run, -m, celery, -A, tests.test_integration.celery_test, worker, --max-tasks-per-child=1]
109- env_file :
110- - .env.docker
111- - .env.docker.test
109+ env_file : config.yml.test
112110 environment :
113111 # CI runs tests in the worker container, so we need to turn off interaction with static files for it
114112 - SYNCMASTER__SERVER__STATIC_FILES__ENABLED=false
115113 volumes :
114+ - ./config.docker.yml:/app/config.yml
116115 - ./syncmaster:/app/syncmaster
117116 - ./reports:/app/reports
118117 - ./tests:/app/tests
0 commit comments