Merge pull request #20 from zalando/feature/patroni-fixed-version

Refer to a tagged Patroni version to use within Spilo
zalando · Sep 7, 2015 · 5d4170d · 5d4170d
2 parents e6b1df1 + cad2597
commit 5d4170d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile
@@ -58,6 +58,13 @@ ENV PATH $PATH:/usr/lib/postgresql-${PGVERSION}/bin
 # Copy the snakeoil certificates for usage as dummy certificates
 RUN cp /etc/ssl/private/ssl-cert-snakeoil.key $PGHOME/dummy.key && cp /etc/ssl/certs/ssl-cert-snakeoil.pem $PGHOME/dummy.crt
 
+# Install Patroni
+ENV PATRONIVERSION 0.1
+WORKDIR $PGHOME
+RUN git clone https://github.com/zalando/patroni.git
+WORKDIR $PGHOME/patroni
+RUN git checkout tags/v${PATRONIVERSION}
+
 ADD postgres_ha.sh /
 RUN chown postgres:postgres $PGHOME -R
 RUN chown postgres:postgres /postgres_ha.sh

diff --git a/postgres-appliance/postgres_ha.sh b/postgres-appliance/postgres_ha.sh
@@ -111,13 +111,6 @@ function write_archive_command_environment
 }
 
 write_postgres_yaml
-
-if [[ ! -d "patroni" ]]
-then
-    # get patroni code
-    git clone https://github.com/zalando/patroni.git
-fi
-
 write_archive_command_environment
 
 # run wal-e s3 backup periodically