infra: dusting

This commit is contained in:
nemunaire 2018-12-06 03:48:53 +01:00
commit 8edc8e697c
5 changed files with 68 additions and 39 deletions

View file

@ -21,11 +21,12 @@ services:
links:
- mysql
volumes:
- ~/fic:/mnt/fic:ro
- /mnt/fic:/mnt/fic:ro
- dashboard:/srv/DASHBOARD
- files:/srv/FILES
- pki:/srv/PKI
- settings:/srv/SETTINGS
- teams:/srv/TEAMS
- teams:/srv/TEAMS:ro
command: --baseurl /admin/ -localimport /mnt/fic -localimportsymlink
depends_on:
- mysql
@ -41,9 +42,9 @@ services:
links:
- mysql
volumes:
- files:/srv/FILES
- files:/srv/FILES:ro
- teams:/srv/TEAMS
- settings:/srv/SETTINGS
- settings:/srv/SETTINGS:ro
- submissions:/srv/submissions
depends_on:
- mysql
@ -58,23 +59,39 @@ services:
ports:
- "8080:8080"
volumes:
- htdocs:/srv/htdocs-frontend
- htdocs:/srv/htdocs-frontend:ro
- files:/srv/FILES:ro
- teams:/srv/TEAMS:ro
- settings:/srv/SETTINGS
- settings:/srv/SETTINGS:ro
- submissions:/srv/submissions
depends_on:
- fic-backend
fic-dashboard:
build:
context: .
dockerfile: Dockerfile-dashboard
image: nemunaire/fic-dashboard:latest
ports:
- "8082:8082"
volumes:
- dashboard:/srv/DASHBOARD
- teams:/srv/TEAMS:ro
- settings:/srv/SETTINGS:ro
depends_on:
- fic-backend
front:
image: nginx:latest
ports:
- "8042:80"
volumes:
- /mnt/fic:/mnt/fic:ro
- ./configs/nginx-frontend-htpasswd.conf:/etc/nginx/conf.d/default.conf:ro
- ./configs/nginx-fic.conf:/etc/nginx/auth.conf:ro
- htdocs:/srv/htdocs-frontend:ro
- files:/srv/FILES:ro
- settings:/srv/SETTINGS:ro
- teams:/srv/TEAMS:ro
depends_on:
- fic-frontend
@ -82,6 +99,7 @@ services:
volumes:
mysql-data:
dashboard:
files:
htdocs:
pki: