Drop support for building core on Ubuntu Bionic and add support for b…

…uilding it on Ubuntu Jammy (fixes #81). (#176)

.github/workflows/clp-core-build.yaml

@@ -73,14 +73,14 @@ jobs:
           local_registry_port: "5000"
           token: "${{secrets.GITHUB_TOKEN}}"
 
-  ubuntu-bionic:
+  ubuntu-focal:
     runs-on: "ubuntu-latest"
     services:
       registry:
         image: "registry:2"
         ports: [ "5000:5000" ]
     env:
-      OS_NAME: "ubuntu-bionic"
+      OS_NAME: "ubuntu-focal"
     steps:
       - uses: "actions/checkout@v3"
         with:
@@ -108,18 +108,18 @@ jobs:
         with:
           os_name: "${{env.OS_NAME}}"
           deps_image_changed: "${{steps.filter.outputs.image}}"
-          push_binaries_image: false
+          push_binaries_image: true
           local_registry_port: "5000"
           token: "${{secrets.GITHUB_TOKEN}}"
 
-  ubuntu-focal:
+  ubuntu-jammy:
     runs-on: "ubuntu-latest"
     services:
       registry:
         image: "registry:2"
         ports: [ "5000:5000" ]
     env:
-      OS_NAME: "ubuntu-focal"
+      OS_NAME: "ubuntu-jammy"
     steps:
       - uses: "actions/checkout@v3"
         with:
@@ -147,6 +147,6 @@ jobs:
         with:
           os_name: "${{env.OS_NAME}}"
           deps_image_changed: "${{steps.filter.outputs.image}}"
-          push_binaries_image: true
+          push_binaries_image: false
           local_registry_port: "5000"
-          token: "${{secrets.GITHUB_TOKEN}}"
+          token: "${{secrets.GITHUB_TOKEN}}"

README.md

@@ -43,10 +43,10 @@ directory:
 # Packages
 The packages held by this [repository](https://github.com/orgs/y-scope/packages?repo_name=clp) are: 
 
-1. Docker Image `clp/clp-core-dependencies-x86-ubuntu-focal`
+1. Docker Image `clp/clp-core-dependencies-x86-ubuntu-jammy`
+    - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Jammy x86 environment
+2. Docker Image `clp/clp-core-dependencies-x86-ubuntu-focal`
     - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Focal x86 environment
-2. Docker Image `clp/clp-core-dependencies-x86-ubuntu-bionic`
-    - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Bionic x86 environment
 3. Docker Image `clp/clp-core-dependencies-x86-centos7.4`
     - A docker image containing all the necessary dependencies to build CLP core in a Centos 7.4 x86 environment
 4. Docker Image `clp/clp-execution-x86-ubuntu-focal`

components/core/README.md

@@ -57,8 +57,8 @@ See the relevant README for your OS:
 
 * [CentOS 7.4](./tools/scripts/lib_install/centos7.4/README.md)
 * [macOS 12](./tools/scripts/lib_install/macos-12/README.md)
-* [Ubuntu 18.04](./tools/scripts/lib_install/ubuntu-bionic/README.md)
 * [Ubuntu 20.04](./tools/scripts/lib_install/ubuntu-focal/README.md)
+* [Ubuntu 22.04](./tools/scripts/lib_install/ubuntu-jammy/README.md)
 
 Want to build natively on an OS not listed here? You can file a [feature request](https://github.com/y-scope/clp/issues/new?assignees=&labels=enhancement&template=feature-request.yml).
 

components/core/tools/docker-images/clp-env-base-ubuntu-bionic/Dockerfile → components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
 WORKDIR /root
 
 RUN mkdir -p ./tools/scripts/lib_install
 ADD ./tools/scripts/lib_install ./tools/scripts/lib_install
 
-RUN ./tools/scripts/lib_install/ubuntu-bionic/install-all.sh
+RUN ./tools/scripts/lib_install/ubuntu-jammy/install-all.sh
 
 # Reset the working directory so that it's accessible by any user who runs the
 # container

components/core/tools/docker-images/clp-env-base-ubuntu-bionic/build.sh → components/core/tools/docker-images/clp-env-base-ubuntu-jammy/build.sh

@@ -3,4 +3,4 @@
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 component_root=${script_dir}/../../../
 
-docker build -t clp-core-dependencies-x86-ubuntu-bionic:dev ${component_root} --file ${script_dir}/Dockerfile
+docker build -t clp-core-dependencies-x86-ubuntu-jammy:dev ${component_root} --file ${script_dir}/Dockerfile

components/core/tools/scripts/lib_install/ubuntu-bionic/install-packages-from-source.sh → components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh

@@ -3,7 +3,6 @@
 ./tools/scripts/lib_install/fmtlib.sh 8.0.1
 ./tools/scripts/lib_install/libarchive.sh 3.5.1
 ./tools/scripts/lib_install/lz4.sh 1.8.2
-./tools/scripts/lib_install/mariadb-connector-c.sh 3.2.3
 ./tools/scripts/lib_install/msgpack.sh 6.0.0
 ./tools/scripts/lib_install/spdlog.sh 1.9.2
 ./tools/scripts/lib_install/zstandard.sh 1.4.9

components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  ca-certificates \
+  checkinstall \
+  cmake \
+  curl \
+  build-essential \
+  git \
+  libboost-filesystem-dev \
+  libboost-iostreams-dev \
+  libboost-program-options-dev \
+  libmariadb-dev \
+  libssl-dev \
+  openjdk-11-jdk \
+  pkg-config \
+  python3 \
+  python3-pip \
+  rsync \
+  software-properties-common