Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 06:43:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
willyb321
2019-03-31 10:24:03 +11:00
parent ef7dfd6ca1 dfca917e50
commit dc88fab4c5
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose.yml
View File

@@ -3,6 +3,10 @@ version: '2.2'
services: services:
coriolis_prod: coriolis_prod:
image: edcd/coriolis:master image: edcd/coriolis:master
build:
dockerfile: Dockerfile
args:
branch: master
restart: always restart: always
volumes: volumes:
- ./nginx.conf:/etc/nginx/nginx.conf - ./nginx.conf:/etc/nginx/nginx.conf
@@ -19,6 +23,10 @@ services:
coriolis_dev: coriolis_dev:
image: edcd/coriolis:develop image: edcd/coriolis:develop
build:
dockerfile: Dockerfile
args:
branch: develop
restart: always restart: always
volumes: volumes:
- ./nginx.conf:/etc/nginx/nginx.conf - ./nginx.conf:/etc/nginx/nginx.conf