Create build container with zlib for main branch (#173)

* XDB-394 fix. Restore original osx packaging files

* added zlib and set archive repos for no longer supported Debian 10

* renamed variable for readability and added sudo to install

Author: MarkSh1

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
             prepare: "debian-based"
             build_on: linux
             parallel: 5
-            image: foundationdb-build:7.4.0-2.ow.build
+            image: foundationdb-build:7.4.0-3.ow.build
             owner: ${GITHUB_REPOSITORY_OWNER@L}
     runs-on: ${{ matrix.run_on }}
     steps:

build-scripts/for-linux/build-debian-based.Dockerfile

@@ -7,12 +7,13 @@ ARG FOR_OS=linux
 
 # The prroject directory must be mounted to /mnt/project
 
-# Set up the runner user
+COPY debian10.sources.list /etc/apt/sources.list
+
 RUN \
-  apt update \
-  && apt install -y sudo apt-utils \
-  && useradd -mN runner \
-  && echo "runner ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/90-runner
+  apt update && \
+  apt install -y sudo apt-utils && \
+  useradd -mN runner && \
+  echo "runner ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/90-runner
 
 USER runner
 WORKDIR /home/runner

build-scripts/for-linux/build-on-linux.bash

@@ -52,9 +52,6 @@ APP_PRMS="$APP_PRMS -DCMAKE_Swift_COMPILER=`$BASE_DIR/find-swift.bash`"
 # set oldest java
 JAVA_OLDEST_PATH=$(get_oldest_java_path)
 
-if [[ $(grep '^ID=debian$' /etc/os-release) ]]; then
-    sudo apt install -y libz-dev
-fi
 
 echo "env JAVA_HOME=$JAVA_OLDEST_PATH CC=clang CXX=clang++ cmake -G Ninja $APP_PRMS $SRC_DIR"
 env JAVA_HOME=$JAVA_OLDEST_PATH CC=clang CXX=clang++ cmake -G Ninja $APP_PRMS $SRC_DIR

build-scripts/for-linux/debian10.sources.list

@@ -0,0 +1,3 @@
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian buster-updates main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main contrib non-free

build-scripts/for-linux/prepare-debian-based.bash

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 BASE_DIR=`dirname $0`
 
@@ -33,6 +33,7 @@ $BASE_DIR/prepare-debian-based-swift.bash
 $BASE_DIR/prepare-debian-based-jemalloc.bash
 
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  zlib1g-dev \
   liblz4-dev \
   libssl-dev
 
@@ -41,5 +42,5 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
   libmono-system-runtime-serialization4.0-cil \
   libmono-system-xml-linq4.0-cil
 
-sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
-  python3-sphinx-bootstrap-theme
+sudo DEBIAN_FRONTEND=noninteractive \
+  python3 -m pip install sphinx-bootstrap-theme || echo "sphinx-bootstrap-theme installed via pip"

build-scripts/for-linux/test-deploy.bash

@@ -121,20 +121,22 @@ test_deploy_pkgs() {
 }
 
 RPM_INSTALL_CMD="dnf install -y"
-DEB_INSTALL_CMD="apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y"
+SOURCES_LIST_CONTENT="$(cat $BASE_DIR/debian10.sources.list)"
+DEB10_INSTALL_CMD="printf '%s\n' \"$SOURCES_LIST_CONTENT\" > /etc/apt/sources.list && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y"
+
 
 echo "Testing DEBs deploy..."
 test_deploy_pkgs \
   "$DEB_IMAGE" \
-  "$DEB_INSTALL_CMD" \
+  "$DEB10_INSTALL_CMD" \
   "foundationdb-server_${FULL_VERSION}_$MY_ARCH_DEB.deb" \
   "foundationdb-clients_${FULL_VERSION}_$MY_ARCH_DEB.deb" \
   Y
 
 echo "Testing versioned DEBs deploy..."
 test_deploy_pkgs \
   "$DEB_IMAGE" \
-  "$DEB_INSTALL_CMD" \
+  "$DEB10_INSTALL_CMD" \
   "foundationdb-$FULL_VERSION-server-versioned_${FULL_VERSION}_$MY_ARCH_DEB.deb" \
   "foundationdb-$FULL_VERSION-clients-versioned_${FULL_VERSION}_$MY_ARCH_DEB.deb" \
   N