mirror of
https://github.com/fergalmoran/dss.docker.git
synced 2025-12-22 01:08:34 +00:00
Merge conflicts
This commit is contained in:
12
.gitmodules
vendored
12
.gitmodules
vendored
@@ -1,9 +1,9 @@
|
|||||||
[submodule "dss.api"]
|
[submodule "dss.api"]
|
||||||
path = dss.api
|
path = dss.api
|
||||||
url = git@github.com:fergalmoran/dss.api.git
|
url = git@github.com:fergalmoran/dss.api.git
|
||||||
[submodule "dss.web"]
|
[submodule "dss.web"]
|
||||||
path = dss.web
|
path = dss.web
|
||||||
url = git@github.com:fergalmoran/dss.web.git
|
url = git@github.com:fergalmoran/dss.web.git
|
||||||
[submodule "dss.radio"]
|
[submodule "dss.radio"]
|
||||||
path = dss.radio
|
path = dss.radio
|
||||||
url = git@github.com:fergalmoran/dss.radio.git
|
url = git@github.com:fergalmoran/dss.radio.git
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
radio:
|
radio:
|
||||||
build: ./radio
|
build: ./dss.radio
|
||||||
command: supervisord -n -c /etc/supervisord.conf
|
command: supervisord -n -c /etc/supervisord.conf
|
||||||
ports:
|
ports:
|
||||||
- "8351:8351"
|
- "8351:8351"
|
||||||
|
- "8888:8888"
|
||||||
|
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
image: tutum/rabbitmq
|
image: tutum/rabbitmq
|
||||||
|
|||||||
Reference in New Issue
Block a user