Merge branch 'PGPROEE9_6_CFS_385' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_CFS_385

Author: knizhnik

.ci/build_and_test_world

@@ -1,5 +1,10 @@
 #!/bin/sh
-
+if [ -z "$TCLCONFIG" ]; then
+[ -x /usr/lib/tcl8.5/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.5
+[ -x /usr/lib/tcl8.6/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.6
+fi
+[ -n "$TCLCONFIG" ] && export TCLCONFIG
+echo TCLCONFIG=${TCLCONFIG}
 #
 # script which exececutes all the build stages. If script executed with
 # no arguments and something fails, every bit of logs, stack traces and

.dockerignore

@@ -0,0 +1,7 @@
+*/*/.git
+.git
+.vscode
+*.yml
+*/*/*.yml
+Dockerfile
+

Dockerfile

@@ -0,0 +1,19 @@
+FROM alpine:3.4
+
+RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make diffutils gdb iproute2 musl-dbg
+
+# there is already accidental postgres user in alpine
+# RUN addgroup pg && adduser -h /pg -D -G pg pg
+RUN mkdir /pg && chown postgres:postgres pg
+
+ENV LANG en_US.utf8
+ENV CFLAGS -O0
+ENV PATH /pg/install/bin:$PATH
+
+COPY ./ /pg/src
+RUN chown -R postgres:postgres /pg
+
+RUN cd /pg/src && \
+	./configure --enable-cassert --enable-debug --prefix=/pg/install && \
+	make -j 4 install
+

GNUmakefile.in

@@ -95,7 +95,7 @@ $(distdir).tar: distdir
 distdir-location:
 	@echo $(distdir)
 
-distdir:
+distdir: src/include/commit_id.h
 	rm -rf $(distdir)* $(dummy)
 	for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
 	  file=`expr X$$x : 'X\./\(.*\)'`; \