Fixing podder in the following ways:
1. Adhering to new Dockerfile paths
2. Passing correct grpc port
3. No crashing on stopping containers
4. New compose file
5. Mostly everything works.
Change-Id: I54d2925947485ea6348389a60db24b2f952555db
diff --git a/podder/handlers.py b/podder/handlers.py
index 40d53a8..2cafc7e 100644
--- a/podder/handlers.py
+++ b/podder/handlers.py
@@ -116,7 +116,6 @@
def stop_slaves(service, instance_name, instance_id, data, conf):
log.info('Stopping slaves for {}'.format(instance_name))
- network = obtain_network_name(data)
config = yaml.load(conf.render())
if service in config['services']:
service_shutdown(service, instance_name, config)
diff --git a/podder/slaves.yml.j2 b/podder/slaves.yml.j2
index 668d7d6..d72bae9 100644
--- a/podder/slaves.yml.j2
+++ b/podder/slaves.yml.j2
@@ -1,6 +1,6 @@
{% macro address(data, network) -%}
{% if data is defined and network is defined -%}
- {{ data['NetworkSettings']['Networks'][network]['IPAddress'] }}:{{ data['NetworkSettings']['Ports']['50555/tcp'][0]['HostPort'] }}
+ {{ data['NetworkSettings']['Networks'][network]['IPAddress'] }}:50555 }}
{%- else -%}
None:None
{%- endif %}