Skip to content

Commit 33bab4e

Browse files
committed
Move conf.d mount out of docker-compose.yml to supplemental configuration for tier, anticipating new configuration for localhost distinct from development
1 parent 4db237d commit 33bab4e

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

docker/docker-compose.deployment.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ services:
1010
limits:
1111
cpus: '8' # 50%
1212
memory: 19.2G # 60%
13-
14-
13+
volumes:
14+
- # Mount conf.d on host machine to the nginx conf.d on container
15+
- "./entity-api/nginx/conf.d:/etc/nginx/conf.d"

docker/docker-compose.development.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
entity-api:
44
build:
55
context: ./entity-api
6-
# Uncomment if tesitng against a specific branch of commons other than the PyPI package
6+
# Uncomment if testing against a specific branch of commons other than the PyPI package
77
# Will also need to use the 'git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons'
88
# in src/requirements.txt accordingly
99
args:
@@ -25,3 +25,5 @@ services:
2525
- "../BUILD:/usr/src/app/BUILD"
2626
# Mount the source code to container
2727
- "../src:/usr/src/app/src"
28+
- # Mount conf.d on host machine to the nginx conf.d on container
29+
- "./entity-api/nginx/conf.d:/etc/nginx/conf.d"

docker/docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ services:
2727
- "../log:/usr/src/app/log"
2828
# Mount the schema yaml file
2929
- "../src/schema/provenance_schema.yaml:/usr/src/app/src/schema/provenance_schema.yaml"
30-
# Mount conf.d on host machine to the nginx conf.d on container
31-
- "./entity-api/nginx/conf.d:/etc/nginx/conf.d"
3230
networks:
3331
- gateway_hubmap
3432
# Send docker logs to AWS CloudWatch

0 commit comments

Comments
 (0)