From 0b669e0d20126462cf23cd1bf0ef943b6f00025f Mon Sep 17 00:00:00 2001
From: Feike Steenbergen <feikesteenbergen@gmail.com>
Date: Fri, 15 May 2015 13:52:20 +0200
Subject: [PATCH] Cleanup

Removed aws reference from Dockerfile, remove unnecessary steps.
Connect using libpq parameters, therefore providing nice application name for Governor.
---
 Dockerfile            | 22 +++++++---------------
 helpers/postgresql.py |  2 +-
 requirements.txt      |  1 +
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53d56965..42a90964 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,39 +1,31 @@
 ## This Dockerfile is meant to aid in the building and debugging governor whilst developing on your local machine
 ## It has all the necessary components to play/debug with a single node appliance, running etcd
-FROM ubuntu:14.04
+FROM zalando/ubuntu:14.04.1-1
 MAINTAINER Feike Steenbergen <feike.steenbergen@zalando.de>
 
 # Add PGDG repositories
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-RUN apt-get install wget ca-certificates -y
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 RUN apt-get update -y
 RUN apt-get upgrade -y
 
 ENV PGVERSION 9.4
-RUN apt-get install curl python python-pip python-psycopg2 python-yaml postgresql-${PGVERSION} -y
+RUN apt-get install python python-psycopg2 python-yaml python-requests postgresql-${PGVERSION} -y
 
-RUN	ln -s /usr/lib/postgresql/* /usr/lib/postgresql/current
-ENV PATH /usr/lib/postgresql/current/bin:$PATH
+ENV PATH /usr/lib/postgresql/${PGVERSION}/bin:$PATH
 
 RUN mkdir -p /governor/helpers
 ADD governor.py /governor/governor.py
-ADD requirements.txt /governor/requirements.txt
 ADD helpers /governor/helpers
 ADD postgres0.yml /governor/
-## As we are standalone, remove any reference to AWS
-RUN sed -i '/aws_use_host_address/d' /governor/postgres0.yml
 
-ENV ETCDVERSION 2.0.9
-RUN curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-amd64.tar.gz -o etcd-v${ETCDVERSION}-linux-amd64.tar.gz && tar vzxf etcd-v${ETCDVERSION}-linux-amd64.tar.gz && cp etcd-v${ETCDVERSION}-linux-amd64/etcd* /bin/
-
-## Most requirements should already have been met, only as an extra precaution
-RUN pip install -r /governor/requirements.txt
+ENV ETCDVERSION 2.0.10
+RUN curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-amd64.tar.gz | tar xz -C /bin --strip=1 --wildcards --no-anchored etcd etcdctl
 
 ## Setting up a simple script that will serve as an entrypoint
 RUN mkdir /data/ && touch /var/log/etcd.log /var/log/etcd.err && chown postgres:postgres /var/log/etcd.*
 RUN chown postgres:postgres -R /governor/ /data/
-RUN /bin/echo -e "etcd --data-dir /tmp/etcd.data > /var/log/etcd.log 2> /var/log/etcd.err &\n/governor/governor.py /governor/postgres0.yml \"$@\"" >> /entrypoint.sh && chmod +x /entrypoint.sh
+RUN /bin/echo -e "etcd --data-dir /tmp/etcd.data > /var/log/etcd.log 2> /var/log/etcd.err &\n/governor/governor.py /governor/postgres0.yml \"\$@\"" >> /entrypoint.sh && chmod +x /entrypoint.sh
 
 ENTRYPOINT /entrypoint.sh
 USER postgres
diff --git a/helpers/postgresql.py b/helpers/postgresql.py
index ce1955f4..7eb884c7 100644
--- a/helpers/postgresql.py
+++ b/helpers/postgresql.py
@@ -56,7 +56,7 @@ class Postgresql:
 
     def cursor(self):
         if not self.cursor_holder:
-            self.conn = psycopg2.connect('postgres://{}/postgres'.format(self.config['connect_address']))
+            self.conn = psycopg2.connect(**self.libpq_parameters)
             self.conn.autocommit = True
             self.cursor_holder = self.conn.cursor()
 
diff --git a/requirements.txt b/requirements.txt
index 377437fe..2185e5c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 PyYAML
 psycopg2
+requests