From 08a4084fbb3a27b3ccec1bc43944b1abae0b5704 Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Wed, 17 Jun 2015 18:26:35 +0530
Subject: [PATCH 1/4] Replace python & python-etcd with bash & etcdctl for
 lesser image size and less dependencies

---
 Dockerfile | 13 ++++++-------
 etcd.tmpl  | 28 ++++++----------------------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5011c6e..2c48334 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,17 @@ FROM ubuntu:14.04
 MAINTAINER Jason Wilder jwilder@litl.com
 
 RUN apt-get update
-RUN apt-get install -y wget python python-pip python-dev libssl-dev libffi-dev bash
-
-RUN mkdir /app
-WORKDIR /app
+RUN apt-get install -y wget bash
 
 RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.3/docker-gen-linux-amd64-0.3.3.tar.gz
 RUN tar xvzf docker-gen-linux-amd64-0.3.3.tar.gz -C /usr/local/bin
 
-RUN pip install python-etcd
+RUN wget https://github.com/coreos/etcd/releases/download/v2.0.12/etcd-v2.0.12-linux-amd64.tar.gz
+RUN tar xvzf etcd-v2.0.12-linux-amd64.tar.gz && mv etcd-v2.0.12-linux-amd64/etcdctl /usr/local/bin
 
-ADD . /app
+RUN mkdir /app
+ADD etcd.tmpl /app/
 
 ENV DOCKER_HOST unix:///var/run/docker.sock
 
-CMD docker-gen -interval 10 -watch -notify "python /tmp/register.py" etcd.tmpl /tmp/register.py
+CMD docker-gen -interval 10 -watch -notify "bash /tmp/register.sh" /app/etcd.tmpl /tmp/register.sh
diff --git a/etcd.tmpl b/etcd.tmpl
index 6527b0f..d1c3b30 100644
--- a/etcd.tmpl
+++ b/etcd.tmpl
@@ -1,27 +1,11 @@
 
-#!/usr/bin/python
+#!/bin/bash
 
-import etcd
-import sys
-from urlparse import urlparse
+test -z "$(echo $ETCD_HOST | cut -d':' -f2)" && ETCD_HOST="$ETCD_HOST:4001"
 
-etcd_host = "{{ .Env.ETCD_HOST }}"
-if not etcd_host:
-    print "ETCD_HOST not set"
-    sys.exit(1)
+alias etcdctl='etcdctl -C http://$ETCD_HOST --no-sync'
 
-port = 4001
-host = etcd_host
-
-if ":" in etcd_host:
-    host, port = etcd_host.split(":")
-
-client = etcd.Client(host=host, port=int(port))
-
-try:
-    backends = client.read("/backends")
-except KeyError:
-    client.write("/backends", None, dir=True)
+etcdctl ls /backends || etcdctl mkdir /backends
 
 {{ $local := . }}
 {{range $key, $value := .}}
@@ -32,8 +16,8 @@ except KeyError:
 {{ if $address.HostPort}}
 # {{ $value.Name }}
 
-client.write("/backends/{{ $value.Image.Repository}}/{{printf "%.*s" 12 $value.ID}}", "{{ $local.Env.HOST_IP }}:{{ $address.HostPort }}", ttl=15)
-client.write("/backends/{{ $value.Image.Repository}}/port", "{{ $address.Port }}", ttl=15)
+etcdctl set --ttl 15 "/backends/{{ $value.Image.Repository}}/{{printf "%.*s" 12 $value.ID}}" "{{ $local.Env.HOST_IP }}:{{ $address.HostPort }}"
+etcdctl set --ttl 15 "/backends/{{ $value.Image.Repository}}/port" "{{ $address.Port }}"
 
 {{ end }}
 {{ end }}

From 537e5a7b372557b48bd1837d311e25806a8dc0a8 Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Wed, 17 Jun 2015 18:52:54 +0530
Subject: [PATCH 2/4] script template- check for existence of ETCD_HOST, abort
 if not

---
 etcd.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etcd.tmpl b/etcd.tmpl
index d1c3b30..bdbc634 100644
--- a/etcd.tmpl
+++ b/etcd.tmpl
@@ -1,6 +1,8 @@
 
 #!/bin/bash
 
+test -z "$ETCD_HOST" && echo "ETCD_HOST not set" && exit 1
+
 test -z "$(echo $ETCD_HOST | cut -d':' -f2)" && ETCD_HOST="$ETCD_HOST:4001"
 
 alias etcdctl='etcdctl -C http://$ETCD_HOST --no-sync'

From c5f482859fca05f44673722e62a390b787cb825d Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Wed, 17 Jun 2015 19:49:41 +0530
Subject: [PATCH 3/4] etcd.tmpl- alias doesn't seem to work for some reason,
 use function instead

---
 etcd.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etcd.tmpl b/etcd.tmpl
index bdbc634..b66efdb 100644
--- a/etcd.tmpl
+++ b/etcd.tmpl
@@ -5,7 +5,7 @@ test -z "$ETCD_HOST" && echo "ETCD_HOST not set" && exit 1
 
 test -z "$(echo $ETCD_HOST | cut -d':' -f2)" && ETCD_HOST="$ETCD_HOST:4001"
 
-alias etcdctl='etcdctl -C http://$ETCD_HOST --no-sync'
+etcdctl() { etcdctl -C http://$ETCD_HOST --no-sync $@; }
 
 etcdctl ls /backends || etcdctl mkdir /backends
 

From 49b9314f3e50bc9a8b72006d8f50de71e2dcdb25 Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Fri, 19 Jun 2015 02:52:36 +0530
Subject: [PATCH 4/4] etcd.tmpl- give full path to binary of same name as
 function inside the function

---
 etcd.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etcd.tmpl b/etcd.tmpl
index b66efdb..3a7fe06 100644
--- a/etcd.tmpl
+++ b/etcd.tmpl
@@ -5,7 +5,7 @@ test -z "$ETCD_HOST" && echo "ETCD_HOST not set" && exit 1
 
 test -z "$(echo $ETCD_HOST | cut -d':' -f2)" && ETCD_HOST="$ETCD_HOST:4001"
 
-etcdctl() { etcdctl -C http://$ETCD_HOST --no-sync $@; }
+etcdctl() { /usr/local/bin/etcdctl -C http://$ETCD_HOST --no-sync $@; }
 
 etcdctl ls /backends || etcdctl mkdir /backends