Docker: Install python packages via pip only, yaml consistency

This commit is contained in:
Feike Steenbergen
2015-12-22 19:49:28 +01:00
parent 6568c56c85
commit feac841aad
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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