Skip to content

Commit

Permalink
Merge 2cd493e into e38538a
Browse files Browse the repository at this point in the history
  • Loading branch information
niekcandaele committed Jul 2, 2020
2 parents e38538a + 2cd493e commit 45f5cc0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,5 @@ config/datastores.js
coverage
assets/images/sdtdIcons
db-data/
redis-data/
test/output
21 changes: 20 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: "3.7"

services:
csmm:
csmm-web:
build: .
#image: catalysm/csmm
depends_on:
Expand All @@ -22,10 +22,29 @@ services:
ports:
- 127.0.0.1:30005:1337
restart: unless-stopped
entrypoint: ["npm", "run", "start:app"]
csmm-worker:
build: .
#image: catalysm/csmm
depends_on:
- cache
- db
environment:
NODE_ENV: ${NODE_ENV:-development}
REDISSTRING: "redis://cache:6379"
DBSTRING: "mysql2://csmm:mysecretpasswordissosecure@db:3306/csmm"
ports:
- 127.0.0.1:30005:1337
healthcheck:
disable: true
restart: unless-stopped
entrypoint: ["npm", "run", "start:worker"]

cache:
image: redis
volumes:
- ./redis-data:/data
command: ["redis-server", "--appendonly", "yes"]
restart: unless-stopped
db:
image: mariadb
Expand Down

0 comments on commit 45f5cc0

Please sign in to comment.