From feac841aadef08edf7e5dfd6d1b6e91f0411fc69 Mon Sep 17 00:00:00 2001
From: Feike Steenbergen <feikesteenbergen@gmail.com>
Date: Tue, 22 Dec 2015 19:48:35 +0100
Subject: [PATCH] Docker: Install python packages via pip only, yaml
 consistency

---
 Dockerfile           | 4 ++--
 docker/entrypoint.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b9c3b9ff..97995128 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,8 @@ RUN apt-get update -y
 RUN apt-get upgrade -y
 
 ENV PGVERSION 9.4
-RUN apt-get install python python-yaml python-requests python-boto postgresql-${PGVERSION} python-dnspython python-kazoo python-pip -y
-RUN apt-get install python-dev postgresql-server-dev-${PGVERSION} python-prettytable -y
+RUN apt-get install postgresql-server-dev-${PGVERSION} -y
+RUN apt-get install python-pip python-dev -y
 ADD requirements-py2.txt /tmp/
 RUN pip install -r /tmp/requirements-py2.txt
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 31d76e8b..b549cc46 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -84,7 +84,7 @@ cat > ~postgres/.config/patroni/patronictl.yaml <<__EOF__
 {dcs_api: 'etcd://${ETCD_CLUSTER}', namespace: /service/}
 __EOF__
 
-cat > /patroni/postgres.yml <<__EOF__
+cat > /patroni/postgres.yaml <<__EOF__
 
 ttl: &ttl 30
 loop_wait: &loop_wait 10
@@ -131,7 +131,7 @@ postgresql:
     hot_standby: "on"
 __EOF__
 
-cat /patroni/postgres.yml
+cat /patroni/postgres.yaml
 
 if [ ! -z $CHEAT ]
 then
@@ -140,5 +140,5 @@ then
         sleep 60
     done
 else
-    exec python /patroni.py /patroni/postgres.yml
+    exec python /patroni.py /patroni/postgres.yaml
 fi