Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit da12502b86cd · 2016-06-21T19:27:37.000+03:00
diff --git a/contrib/mmts/Dockerfile b/contrib/mmts/Dockerfile
@@ -32,17 +32,19 @@ RUN cd /pg && \
 	./configure  --enable-cassert --enable-debug --prefix=/pg/install && \
 	make -j 4 install
 
-RUN mkdir /pg/data
 ENV PATH /pg/install/bin:$PATH
 ENV PGDATA /pg/data
+RUN mkdir PGDATA
 
 # Here we can insert some ENV var to invalidate subsequent layers
 
 RUN cd /pg/postgres_cluster/contrib/raftable && make install
 
 RUN mkdir /pg/mmts
 COPY ./ /pg/mmts/
-RUN cd /pg/mmts && USE_PGXS=1 RAFTABLE_PATH=/pg/postgres_cluster/contrib/raftable make install
+ENV RAFTABLE_PATH /pg/postgres_cluster/contrib/raftable
+ENV USE_PGXS 1
+RUN cd /pg/mmts && make clean && make install
 
 ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
 
