Skip to content

Commit

Permalink
CU-2nqa6pa: use stock nginx configured with conf / sites-enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
tomolopolis committed May 1, 2024
1 parent 1f84f92 commit 5eaa1e9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
8 changes: 3 additions & 5 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

# Dev compose yml file for building, running and mounting local git cloned repo.

services:
Expand All @@ -26,13 +24,13 @@ services:
command: /home/scripts/run.sh

nginx:
build:
network: host
context: ./nginx
image: nginx
restart: always
volumes:
- api-media:/home/api/media
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
ports:
- ${MCTRAINER_PORT:-8001}:8000
depends_on:
Expand Down
5 changes: 3 additions & 2 deletions docker-compose-mc0x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ services:
- ./envs/env-mc0x
command: /home/run.sh
nginx:
container_name: medcattrainer_nginx
image: cogstacksystems/medcat-trainer-nginx:mc-v0.x-latest
image: nginx
restart: always
volumes:
- api-media:/home/api/media
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
ports:
- "${MCTRAINER_PORT:-8001}:8000"
depends_on:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

# Prod compose file -

services:
Expand Down Expand Up @@ -39,11 +37,13 @@ services:

nginx:
container_name: medcattrainer_nginx
image: cogstacksystems/medcat-trainer-nginx:v2.16.0
image: nginx
restart: always
volumes:
- api-media:/home/api/media
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
ports:
- "${MCTRAINER_PORT:-8001}:8000"
depends_on:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

# Default compose yml file - uses latest build of MedCATtrainer services. Default passwords and example
# projects are not used.

Expand Down Expand Up @@ -35,11 +33,13 @@ services:
command: cron -f -l 2

nginx:
image: cogstacksystems/medcat-trainer-nginx:v2.16.0
image: nginx
restart: always
volumes:
- api-media:/home/api/media
- api-static:/home/api/static
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/sites-enabled/:/etc/nginx/sites-enabled
ports:
- ${MCTRAINER_PORT:-8001}:8000
depends_on:
Expand Down
7 changes: 0 additions & 7 deletions nginx/Dockerfile

This file was deleted.

0 comments on commit 5eaa1e9

Please sign in to comment.