Script to build tarballs in Docker

Author: mpartel

Dockerfile.test renamed to Dockerfile

@@ -28,4 +28,5 @@ RUN apt-get update \
  && sudo -u postgres createuser -s root
 
 COPY /test_protos /app/test_protos
-COPY Makefile *.hpp *.cpp *.rb *.sh *.sql *.control *.md /app/
+COPY Makefile *.hpp *.cpp *.rb *.sh *.sql *.control *.md *.txt /app/
+RUN cd /app && make clean && make -j16 dist

Makefile

@@ -66,16 +66,17 @@ COMPILE.cxx.bc = $(CLANG) -xc++ -Wno-ignored-attributes $(BITCODE_CPPFLAGS) $(CP
 	$(COMPILE.cxx.bc) -o $@ $<
 	$(LLVM_BINPATH)/opt -module-summary -f $@ -o $@
 
-DIST_DIR = dist/postgres-protobuf-$(EXT_VERSION)
+DIST_TAR_BASENAME = postgres-protobuf-v$(EXT_VERSION)-for-pg$(MAJORVERSION)
+DIST_DIR = dist/$(DIST_TAR_BASENAME)
 dist: all
 	rm -Rf dist
 	mkdir -p $(DIST_DIR)/lib $(DIST_DIR)/extension $(DIST_DIR)/lib/bitcode
 	cp postgres_protobuf.so $(DIST_DIR)/lib/
 	cp postgres_protobuf.control $(DIST_DIR)/extension/
 	cp postgres_protobuf--*.sql $(DIST_DIR)/extension/
-	cp README.md $(DIST_DIR)/extension/
+	cp README.md LICENSE.txt $(DIST_DIR)/extension/
 	cp *.bc $(DIST_DIR)/lib/bitcode/
 	cd $(DIST_DIR)/lib/bitcode && $(LLVM_BINPATH)/llvm-lto -thinlto -thinlto-action=thinlink -o postgres_protobuf.index.bc *.bc
-	tar -C dist -cvzf dist/postgres-protobuf-$(EXT_VERSION).tar.gz postgres-protobuf-$(EXT_VERSION)
+	tar -C dist -cvzf dist/$(DIST_TAR_BASENAME).tar.gz $(DIST_TAR_BASENAME)
 
 .PHONY: all clean protoc postgres_protobuf_clean dist

build-and-test.sh

@@ -7,8 +7,8 @@ POSTGRES_VERSION=${POSTGRES_VERSION:-11}
 
 if [[ -n "${USE_DOCKER:-}" ]]; then
     unset USE_DOCKER
-    docker build -f Dockerfile.test --build-arg=POSTGRES_VERSION="${POSTGRES_VERSION}" -t postgres-protobuf-test:"${POSTGRES_VERSION}" .
-    docker run postgres-protobuf-test:"${POSTGRES_VERSION}" env __IN_DOCKER=1 /app/build-and-test.sh
+    docker build --build-arg=POSTGRES_VERSION="${POSTGRES_VERSION}" -t postgres-protobuf-build:"${POSTGRES_VERSION}" .
+    docker run postgres-protobuf-build:"${POSTGRES_VERSION}" env NO_CLEAN=1 __IN_DOCKER=1 /app/build-and-test.sh
     exit $?
 fi
 

docker-build-dist.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euxo pipefail
+
+cd "$(dirname "${0}")"
+
+POSTGRES_VERSION=${POSTGRES_VERSION:-11}
+
+mkdir -p dist
+docker build --build-arg=POSTGRES_VERSION="${POSTGRES_VERSION}" -t postgres-protobuf-build:"${POSTGRES_VERSION}" .
+docker run -it --rm --volume "$(pwd)/dist:/out" postgres-protobuf-build:"${POSTGRES_VERSION}" pg_config --version
+docker run -it --rm --volume "$(pwd)/dist:/out" postgres-protobuf-build:"${POSTGRES_VERSION}" /bin/bash -c 'cp -f /app/dist/*.tar.gz /out/'