Skip to content

Commit

Permalink
CU-8695tx1r8: pass env files in correctly. Setting MCTRAINER_PORT req…
Browse files Browse the repository at this point in the history
…uires `export MCTRAINER_PORT; docker compose up`
  • Loading branch information
tomolopolis committed Sep 20, 2024
1 parent 6ee9760 commit 0f3a437
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ services:
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
env_file:
- ./envs/env
ports:
- ${MCTRAINER_PORT:-8001}:8000
depends_on:
Expand All @@ -41,6 +43,8 @@ services:
container_name: mct_solr
image: solr:8
restart: always
env_file:
- ./envs/env
ports:
- ${SOLR_PORT:-8983}:8983
volumes:
Expand Down
6 changes: 5 additions & 1 deletion docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- api-db:/home/api/db
- api-db-backup:/home/api/db-backup
env_file:
- ./envs/env
- ./envs/env-prod
entrypoint: /home/scripts/entry.sh
command: cron -f -l 2

Expand All @@ -44,6 +44,8 @@ services:
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
env_file:
- ./envs/env-prod
ports:
- "${MCTRAINER_PORT:-8001}:8000"
depends_on:
Expand All @@ -54,6 +56,8 @@ services:
container_name: mct_solr
image: solr:8
restart: always
env_file:
- ./envs/env-prod
expose:
- "8983"
volumes:
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ services:
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
env_file:
- ./envs/env
ports:
- ${MCTRAINER_PORT:-8001}:8000
depends_on:
Expand All @@ -50,6 +52,8 @@ services:
container_name: mct_solr
image: solr:8
restart: always
env_file:
- ./envs/env
ports:
- ${SOLR_PORT:-8983}:8983
volumes:
Expand Down

0 comments on commit 0f3a437

Please sign in to comment.