From 5e8a5342779d10239f6bfbe5ec33c756062c62fb Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 22 Sep 2015 22:06:27 +0100 Subject: [PATCH 1/4] Added radio submodule --- .gitignore | 1 + .gitmodules | 3 +++ dss.radio | 1 + 3 files changed, 5 insertions(+) create mode 160000 dss.radio diff --git a/.gitignore b/.gitignore index 0ced012..c6246da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .env .dss.web/ .dss.api/ +.dss.radio/ diff --git a/.gitmodules b/.gitmodules index 61c6aa2..bb7561e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "dss.web"] path = dss.web url = git@github.com:fergalmoran/dss.web.git +[submodule "dss.radio"] + path = dss.radio + url = git@github.com:fergalmoran/dss.radio.git diff --git a/dss.radio b/dss.radio new file mode 160000 index 0000000..04d9de8 --- /dev/null +++ b/dss.radio @@ -0,0 +1 @@ +Subproject commit 04d9de83704da8ea5fc0c1e282d205d4bbb77707 From 16dfdc5f0889315afcda7f5c1377e30128066039 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 22 Sep 2015 22:07:30 +0100 Subject: [PATCH 2/4] Added ports to docker-compose --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 218f334..838c3e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,9 @@ radio: - build: ./radio + build: ./dss.radio command: supervisord -n -c /etc/supervisord.conf ports: - "8351:8351" + - "8888:8888" rabbitmq: image: tutum/rabbitmq From 8d3b4e49b1e011557288a4751c36137b4303094b Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 22 Sep 2015 22:09:06 +0100 Subject: [PATCH 3/4] Fixed modules --- .gitignore | 6 +++--- .gitmodules | 9 --------- dss.radio | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) mode change 160000 => 120000 dss.radio diff --git a/.gitignore b/.gitignore index c6246da..799a4e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .env -.dss.web/ -.dss.api/ -.dss.radio/ +dss.web/ +dss.api/ +dss.radio/ diff --git a/.gitmodules b/.gitmodules index bb7561e..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +0,0 @@ -[submodule "dss.api"] - path = dss.api - url = git@github.com:fergalmoran/dss.api.git -[submodule "dss.web"] - path = dss.web - url = git@github.com:fergalmoran/dss.web.git -[submodule "dss.radio"] - path = dss.radio - url = git@github.com:fergalmoran/dss.radio.git diff --git a/dss.radio b/dss.radio deleted file mode 160000 index 04d9de8..0000000 --- a/dss.radio +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04d9de83704da8ea5fc0c1e282d205d4bbb77707 diff --git a/dss.radio b/dss.radio new file mode 120000 index 0000000..5e792a0 --- /dev/null +++ b/dss.radio @@ -0,0 +1 @@ +../dss.radio/ \ No newline at end of file From 2fcc8f70e47d44611fde411f5902eb4d3d8c8e13 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 22 Sep 2015 22:17:23 +0100 Subject: [PATCH 4/4] Fixed .gitignore --- .gitignore | 6 +++--- .gitmodules | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 799a4e1..07ee2c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .env -dss.web/ -dss.api/ -dss.radio/ +dss.web +dss.api +dss.radio diff --git a/.gitmodules b/.gitmodules index e69de29..56b58dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,10 @@ +[submodule "dss.api"] + path = dss.api + url = git@github.com:fergalmoran/dss.api.git +[submodule "dss.web"] + path = dss.web + url = git@github.com:fergalmoran/dss.web.git +[submodule "dss.radio"] + path = dss.radio + url = git@github.com:fergalmoran/dss.radio.git +