Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace python-etcd with bash+etcdctl #8

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Replace python-etcd with bash+etcdctl #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08a4084
Replace python & python-etcd with bash & etcdctl for lesser image siz…
viranch Jun 17, 2015
537e5a7
script template- check for existence of ETCD_HOST, abort if not
viranch Jun 17, 2015
c5f4828
etcd.tmpl- alias doesn't seem to work for some reason, use function i…
viranch Jun 17, 2015
49b9314
etcd.tmpl- give full path to binary of same name as function inside t…
viranch Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ FROM ubuntu:14.04
MAINTAINER Jason Wilder [email protected]

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
28 changes: 7 additions & 21 deletions etcd.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@

#!/usr/bin/python
#!/bin/bash

import etcd
import sys
from urlparse import urlparse
test -z "$ETCD_HOST" && echo "ETCD_HOST not set" && exit 1

etcd_host = "{{ .Env.ETCD_HOST }}"
if not etcd_host:
print "ETCD_HOST not set"
sys.exit(1)
test -z "$(echo $ETCD_HOST | cut -d':' -f2)" && ETCD_HOST="$ETCD_HOST:4001"

port = 4001
host = etcd_host
etcdctl() { /usr/local/bin/etcdctl -C http://$ETCD_HOST --no-sync $@; }

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 := .}}
Expand All @@ -32,8 +18,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 }}
Expand Down