From 7e0ec29635517c76041602024f34032d96b86c34 Mon Sep 17 00:00:00 2001
From: sanderegg <35365065+sanderegg@users.noreply.github.com>
Date: Tue, 26 Mar 2019 09:41:30 +0100
Subject: [PATCH 1/2] fixed director in devel mode

---
 services/director/Dockerfile                             | 2 ++
 services/director/src/simcore_service_director/config.py | 3 ++-
 services/docker-compose.devel.yml                        | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/director/Dockerfile b/services/director/Dockerfile
index 02a68a7bf14..f56fafc9aea 100644
--- a/services/director/Dockerfile
+++ b/services/director/Dockerfile
@@ -141,6 +141,8 @@ ENV SC_BOOT_MODE development
 WORKDIR /devel
 VOLUME  /devel/packages
 VOLUME  /devel/services/director/
+VOLUME /devel/services/api
+ENV NODE_SCHEMA_LOCATION ../../../api/specs/shared/schemas/node-meta-v0.0.1.json
 
 ENTRYPOINT [ "/bin/sh", "services/director/docker/entrypoint.sh" ]
 CMD ["/bin/sh", "services/director/docker/boot.sh"]
diff --git a/services/director/src/simcore_service_director/config.py b/services/director/src/simcore_service_director/config.py
index dfbde10fa28..d930b058f14 100644
--- a/services/director/src/simcore_service_director/config.py
+++ b/services/director/src/simcore_service_director/config.py
@@ -30,4 +30,5 @@
 
 # some services need to know the published host to be functional (paraview)
 PUBLISHED_HOST_NAME = os.environ.get("PUBLISHED_HOST_NAME", "")
-NODE_SCHEMA_LOCATION = "{root}/{version}/schemas/node-meta-v0.0.1.json".format(root=API_ROOT, version=API_VERSION)
+NODE_SCHEMA_LOCATION = os.environ.get("NODE_SCHEMA_LOCATION",
+    "{root}/{version}/schemas/node-meta-v0.0.1.json".format(root=API_ROOT, version=API_VERSION))
diff --git a/services/docker-compose.devel.yml b/services/docker-compose.devel.yml
index 2bf15a464f2..2b8c063da9e 100644
--- a/services/docker-compose.devel.yml
+++ b/services/docker-compose.devel.yml
@@ -15,6 +15,7 @@ services:
     volumes:
       - ./director:/devel/services/director
       - ../packages/service-library:/devel/packages/service-library
+      - ../api:/devel/services/api
     stdin_open: true
     tty: true
   #--------------------------------------------------------------------

From aa52bd18c80895effea5074aa4356bb314ca0089 Mon Sep 17 00:00:00 2001
From: sanderegg <35365065+sanderegg@users.noreply.github.com>
Date: Thu, 6 Jun 2019 09:35:09 +0200
Subject: [PATCH 2/2] find network using full network name

---
 services/director/src/simcore_service_director/producer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py
index c1c302c57c1..ae6951c8e57 100644
--- a/services/director/src/simcore_service_director/producer.py
+++ b/services/director/src/simcore_service_director/producer.py
@@ -193,7 +193,7 @@ async def _get_service_entrypoint(service_boot_parameters_labels: Dict) -> str:
 async def _get_swarm_network(client: aiodocker.docker.Docker) -> Dict:
     network_name = "_default"
     if config.SWARM_STACK_NAME:
-        network_name = config.SWARM_STACK_NAME
+        network_name = "{}_default".format(config.SWARM_STACK_NAME)
     # try to find the network name (usually named STACKNAME_default)
     networks = [x for x in (await client.networks.list()) if "swarm" in x["Scope"] and network_name in x["Name"]]
     if not networks or len(networks) > 1: