Fix build for Focal, cleanup build .deb files before saving new

Author: rustprooflabs

build/build.sh

@@ -35,7 +35,7 @@ echo "PGX Version: ${PGXVERSION}"
 mkdir -p ${LOGDIR}
 mkdir -p ${ARTIFACTDIR}
 
-for image in `ls docker/ | grep jammy` ; do
+for image in `ls docker/ | grep focal` ; do
 
     OS_DIST=$(echo ${image}|cut -f2 -d-)
     OS_VER=$(echo ${image}|cut -f3 -d-)

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -14,8 +14,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make wget curl gnupg git
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
     && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
+RUN apt-get update && apt-get upgrade -y --fix-missing
+RUN apt-get install -y --fix-missing \
         clang-12 llvm-12 clang libz-dev strace pkg-config \
         libxml2 libxml2-dev libreadline8 libreadline-gplv2-dev \
         flex bison libbison-dev build-essential \

build/package.sh

@@ -58,6 +58,8 @@ find ./ -name "*.so" -exec strip {} \;
 #
 OUTNAME=pgdd_${VERSION}_${OSNAME}_${PG_VER}_amd64
 if [ "${PKG_FORMAT}" == "deb" ]; then
+	rm ${OUTNAME}.deb || true
+
 	fpm \
 		-s dir \
 		-t deb \