commit 1edb82867fe4828813a9bb7c6a3953b314105a1c
author Zsolt Haraszti <zharaszt@ciena.com> Tue Nov 08 10:57:19 2016 -0800
committer khenaidoo Nursimulu <knursimu@ciena.com> Tue Nov 08 11:15:18 2016 -0800
tree 582255fc5cd72aa1cea5c713be95e1ad17c3054f
parent fa523c636bb0b8446a9a827713731ae8c6de8090

Fix to docker import issues and swagger error

This is actually two fixes in one change:
1. Fixing the import issues in the docker containers, also cleaning
   it up.
2. Avoiding the creation of multiple swagger.json files by specifying
   which of the proto files represent the top-level service.

Change-Id: I9fec5cf48df127725673ba53f0e91d2ed2e275ad

compose/docker-compose-system-test.yml

diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index ad23313..c186b8f 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -73,7 +73,7 @@
   voltha:
     image: cord/voltha
     command: [
-      "/voltha/main.py",
+      "/voltha/voltha/main.py",
       "-v",
       "--consul=${DOCKER_HOST_IP}:8500",
       "--fluentd=fluentd:24224",
@@ -106,7 +106,7 @@
   chameleon:
     image: cord/chameleon
     command: [
-      "/chameleon/main.py",
+      "/chameleon/chameleon/main.py",
       "-v",
       "--consul=consul:8500",
       "--fluentd=fluentd:24224",
@@ -133,7 +133,7 @@
   ofagent:
     image: cord/ofagent
     command: [
-      "/ofagent/main.py",
+      "/ofagent/ofagent/main.py",
       "-v",
       "--consul=${DOCKER_HOST_IP}:8500",
       "--fluentd=fluentd:24224",