Merge conflicts

This commit is contained in:
Fergal Moran
2015-09-22 21:18:30 +00:00
3 changed files with 9 additions and 7 deletions

View File

@@ -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

1
dss.radio Symbolic link
View File

@@ -0,0 +1 @@
../dss.radio/