Temporary swicth to pg_repack from github (#215)

* Temporary install pg_repack from sources, package from pgdg is broken due to changes in postgres * Bump timescaledb version
zalando · Mar 12, 2018 · 08d9a56 · 08d9a56
1 parent 22472d5
commit 08d9a56
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/postgres-appliance/Dockerfile.build b/postgres-appliance/Dockerfile.build
@@ -71,7 +71,7 @@ ENV PGVERSION="$PGVERSION" \
     SET_USER=REL1_4_0 \
     PLPGSQL_CHECK=v1.2.2 \
     PLPROFILER=REL3_2 \
-    TIMESCALEDB=0.8.0 \
+    TIMESCALEDB=0.9.0 \
     PGEXTWLIST=v1.6 \
     PAM_OAUTH2=v1.0
 
@@ -115,16 +115,17 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && git clone -b $PLPROFILER https://bitbucket.org/openscg/plprofiler.git \
 
     && git clone -b $TIMESCALEDB https://github.com/timescale/timescaledb.git \
-    && cd timescaledb \
-    && curl -sL https://github.com/timescale/timescaledb/pull/428.diff | patch -p1 \
-    && cd ../ \
 
     && git clone -b $PGEXTWLIST https://github.com/dimitri/pgextwlist.git \
     && perl -ne 'print unless /PG_TRY/ .. /PG_CATCH/' pgextwlist/pgextwlist.c > pgextwlist.c.f \
     && egrep -v '(PG_END_TRY|EmitWarningsOnPlaceholders)' pgextwlist.c.f > pgextwlist/pgextwlist.c \
 
     && git clone git://www.sigaev.ru/plantuner.git \
 
+    && git clone https://github.com/reorg/pg_repack.git \
+    && cd pg_repack \
+    && curl -sL https://github.com/reorg/pg_repack/pull/171.diff | patch -p1 \
+
     && for version in ${PGOLDVERSIONS} ${PGVERSION}; do \
             sed -i "s/ main.*$/ main $version/g" /etc/apt/sources.list.d/pgdg.list \
             && apt-get update \
@@ -141,7 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
             # Install PostgreSQL binaries, contrib, plproxy and multiple pl's
             && apt-get install --allow-downgrades -y postgresql-contrib-${version} $EXTRAS \
                         postgresql-${version}-plproxy postgresql-plpython3-${version} \
-                        postgresql-${version}-repack postgresql-${version}-pldebugger \
+                        postgresql-${version}-pldebugger \
                         postgresql-${version}-pgq3 libpq5=$version* \
                         libpq-dev=$version* postgresql-server-dev-${version} \
 
@@ -166,6 +167,9 @@ RUN export DEBIAN_FRONTEND=noninteractive \
                 make -C $n USE_PGXS=1 clean install-strip; \
             done \
 
+            && make -C pg_repack USE_PGXS=1 clean install \
+            && strip /usr/lib/postgresql/$version/lib/pg_repack.so /usr/lib/postgresql/$version/bin/pg_repack \
+
             && if [ "$version" != "9.3" ] && [ "$DEMO" != "true" ]; then \
                 make -C postgres-decoderbufs-$DECODEBUFS_COMMIT clean install-strip; \
             fi \