Skip to content

Commit

Permalink
Build docker image with python-etcd
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Kukushkin committed Sep 1, 2015
1 parent 5c7d4ed commit ac36aa0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion postgres-appliance/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN pip install six --upgrade
RUN pip install wal-e

# Install kazoo for ZooKeeper
RUN pip install kazoo
RUN pip install kazoo python-etcd

ENV ETCDVERSION 2.0.13
# install etcd
Expand Down
7 changes: 7 additions & 0 deletions postgres-appliance/postgres_ha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ __EOF__
hosts: ${EXHIBITOR_HOSTS}
__EOF__
fi
elif [[ -n $ETCD_HOST ]]; then
cat >> postgres.yml <<__EOF__
etcd:
scope: *scope
ttl: *ttl
host: ${ETCD_HOST}
__EOF__
elif [[ -n $ETCD_DISCOVERY_DOMAIN ]]; then
cat >> postgres.yml <<__EOF__
etcd:
Expand Down

0 comments on commit ac36aa0

Please sign in to comment.