From f323f0c2e469a454d793ba50c7c5db42b87a9d69 Mon Sep 17 00:00:00 2001
From: Jules Robichaud-Gagnon <jules.robichaud@solutionstlm.com>
Date: Tue, 8 Jan 2019 13:24:35 -0500
Subject: [PATCH 1/2] Add support to laz-perf

---
 docker/Dockerfile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 10753f31..0a51ae19 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,22 +14,30 @@ RUN apt-get update \
         git \
         ca-certificates \
         build-essential \
+        cmake \
         autoconf \
         automake \
         zlib1g-dev \
         postgresql-server-dev-all \
         libxml2-dev \
     && rm -rf /var/lib/apt/lists/* \
+    && git clone https://github.com/verma/laz-perf.git \
+    && cd laz-perf \
+    && cmake . \
+    && make \
+    && make install \
+    && cd / \
     && git clone https://github.com/pgpointcloud/pointcloud \
     && cd pointcloud \
     && ./autogen.sh \
-    && ./configure --with-pgconfig=/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_config CFLAGS="-Wall -Werror -O2 -g" \
+    && ./configure --with-pgconfig=/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_config CFLAGS="-Wall -Werror -O2 -g" --with-lazperf=/usr/local \
     && make \
     && make install \
     && apt-get purge -y --auto-remove \
         git \
         ca-certificates \
         build-essential \
+        cmake \
         autoconf \
         automake \
         zlib1g-dev \

From cc54a7ca2c4977c67573f3d78f8f61908cf13261 Mon Sep 17 00:00:00 2001
From: Jules Robichaud-Gagnon <jules.robichaud@solutionstlm.com>
Date: Tue, 8 Jan 2019 15:22:31 -0500
Subject: [PATCH 2/2] Install only the appropriate postgres version

---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0a51ae19..ddb0768b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
         autoconf \
         automake \
         zlib1g-dev \
-        postgresql-server-dev-all \
+        postgresql-server-dev-${POSTGRES_VERSION} \
         libxml2-dev \
     && rm -rf /var/lib/apt/lists/* \
     && git clone https://github.com/verma/laz-perf.git \
@@ -30,7 +30,7 @@ RUN apt-get update \
     && git clone https://github.com/pgpointcloud/pointcloud \
     && cd pointcloud \
     && ./autogen.sh \
-    && ./configure --with-pgconfig=/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_config CFLAGS="-Wall -Werror -O2 -g" --with-lazperf=/usr/local \
+    && ./configure CFLAGS="-Wall -Werror -O2 -g" --with-lazperf=/usr/local \
     && make \
     && make install \
     && apt-get purge -y --auto-remove \
@@ -41,5 +41,5 @@ RUN apt-get update \
         autoconf \
         automake \
         zlib1g-dev \
-        postgresql-server-dev-all \
+        postgresql-server-dev-${POSTGRES_VERSION}  \
         libxml2-dev