c3lf/c3lf-system-3
7
0
Fork 0
Code Issues 52 Pull requests Projects 2 Releases Wiki Activity Actions

release_2024-11-13 #88

Merged
j3d1 merged 20 commits from testing into live 2024-11-13 18:54:48 +00:00
Conversation 0 Commits 20 Files changed 40 +17 -2
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0f8462dc7c - Show all commits

17
deploy/dev/docker-compose.yml
View file

@ -6,11 +6,17 @@ services:
command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000' command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000'
environment: environment:
- HTTP_HOST=core - HTTP_HOST=core
#- DATABASE_URL - DB_HOST=db
- DB_PORT=3306
- DB_NAME=system3
- DB_USER=system3
- DB_PASSWORD=system3
volumes: volumes:
- ../../core:/code - ../../core:/code
ports: ports:
- "8000:8000" - "8000:8000"
depends_on:
- db
frontend: frontend:
build: build:
@ -23,6 +29,8 @@ services:
- ./vue.config.js:/web/vue.config.js - ./vue.config.js:/web/vue.config.js
ports: ports:
- "8080:8080" - "8080:8080"
depends_on:
- core
db: db:
image: mariadb image: mariadb
@ -31,3 +39,10 @@ services:
MARIADB_DATABASE: system3 MARIADB_DATABASE: system3
MARIADB_USER: system3 MARIADB_USER: system3
MARIADB_PASSWORD: system3 MARIADB_PASSWORD: system3
volumes:
- mariadb_data:/var/lib/mysql
ports:
- "3306:3306"
volumes:
mariadb_data: