From b6152a113b24aecf5dba14e46edd9c36319776b5 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 8 Jun 2015 21:44:42 +0000 Subject: [PATCH] wip --- connect-services.py | 4 +++- unlink-services.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/connect-services.py b/connect-services.py index 41cd57cb..35422253 100755 --- a/connect-services.py +++ b/connect-services.py @@ -46,7 +46,7 @@ for service_name, service in stack.items(): endpoint = subprocess.check_output( ["docker", "port", container_name, port] ) - endpoints.append(endpoint.strip()) + endpoints.append(endpoint.strip()) for container_name in service_instances[service_name]: ambassador = {} ambassador["image"] = "jpetazzo/hamba" @@ -61,6 +61,8 @@ for service_name, service in stack.items(): for service_name, service in stack.items(): for container_name in service_instances[service_name]: + print("docker exec {} sh -c 'sed /^127.127/d /etc/hosts >/tmp/hosts && cat /tmp/hosts >/etc/hosts && rm /tmp/hosts'" + .format(container_name)) extra_hosts = service.get("extra_hosts", {}) for link_name, link_addr in extra_hosts.items(): print("docker exec {} sh -c 'echo {} {} >> /etc/hosts'" diff --git a/unlink-services.py b/unlink-services.py index 05e169ff..9ccadf99 100755 --- a/unlink-services.py +++ b/unlink-services.py @@ -14,7 +14,7 @@ ports = yaml.load(open("ports.yml")) def generate_local_addr(): last_byte = 2 while last_byte<255: - yield "127.0.0.{}".format(last_byte) + yield "127.127.0.{}".format(last_byte) last_byte += 1 for service_name, service in stack.items(): @@ -32,6 +32,8 @@ for service_name, service in stack.items(): del service["links"] if "ports" in service: del service["ports"] + if "volumes" in service: + del service["volumes"] if service_name in ports: service["ports"] = [ ports[service_name] ]