incremental build of docker containers

kelvich · kelvich · commit d34581bd283d · 2016-06-20T19:31:16.000+03:00
diff --git a/contrib/mmts/Dockerfile b/contrib/mmts/Dockerfile
@@ -0,0 +1,51 @@
+# vim:set ft=dockerfile:
+FROM debian:jessie
+
+# explicitly set user/group IDs
+RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
+
+# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
+RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+ENV LANG en_US.utf8
+
+# postgres build deps
+RUN apt-get update && apt-get install -y \
+	git \
+	make \
+	gcc \
+	gdb \
+	libreadline-dev \
+	bison \
+	flex \
+	zlib1g-dev \ 
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /pg && chown postgres:postgres /pg
+USER postgres
+ENV CFLAGS -O0
+WORKDIR /pg
+
+RUN cd /pg && \
+	git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \
+	cd /pg/postgres_cluster && \
+	./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
+
+# 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
+
+ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
+
+EXPOSE 5432
+CMD ["postgres"]
+
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -1,7 +1,11 @@
 MODULE_big = multimaster
 OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o
 
-override CPPFLAGS += -I../raftable
+ifndef RAFTABLE_PATH
+RAFTABLE_PATH = ../raftable
+endif
+
+override CPPFLAGS += -I$(RAFTABLE_PATH)
 
 EXTRA_INSTALL = contrib/raftable contrib/mmts
 
@@ -33,3 +37,11 @@ check:
 	env DESTDIR='$(abs_top_builddir)'/tmp_install make install
 	$(prove_check)
 
+xcheck:
+	#pip install -r tests2/requirements.txt
+	docker build -t pgmmts .
+	cd tests2 && blockade up
+	sleep 10 # wait for mmts init
+	cd tests2 && python test_recovery.py || true
+	cd tests2 && blockade destroy
+
diff --git a/contrib/mmts/tests2/Dockerfile b/contrib/mmts/tests2/Dockerfile
diff --git a/contrib/mmts/tests2/Vagrantfile b/contrib/mmts/tests2/Vagrantfile
@@ -27,6 +27,8 @@ Vagrant.configure(2) do |config|
     vb.memory = 2048
   end
 
+  config.vm.synced_folder "../../..", "/postgres_sources"
+
   # there are obviously vagrant versions with a
   # broken 'docker' provisioner that can be fixed
   # by invoking an 'apt-get update' *before* docker itself
