From 811462039535df7207e989cfe1da4886e3c5a8b0 Mon Sep 17 00:00:00 2001
From: Roberto Rossini <71787608+robomics@users.noreply.github.com>
Date: Sat, 9 Dec 2023 17:16:43 +0100
Subject: [PATCH 1/2] Fix Dockerfile ARM builds

---
 Dockerfile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 36ae11b5..86ba3e3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,6 +28,15 @@ RUN if [ -z "$C_COMPILER" ]; then echo "Missing C_COMPILER --build-arg" && exit
 ENV CC="$C_COMPILER"
 ENV CXX="$CXX_COMPILER"
 
+# Install b2 using Conan
+RUN printf '[requires]\nb2/4.10.1\n[options]\nb2*:toolset=%s' \
+           "$(basename "$(which "$CC")")" | cut -f 1 -d - > /tmp/conanfile.txt
+
+RUN conan install /tmp/conanfile.txt                 \
+                 --build=missing                     \
+                 -pr:b="$CONAN_DEFAULT_PROFILE_PATH" \
+                 -pr:h="$CONAN_DEFAULT_PROFILE_PATH"
+
 # Build hictk deps using Conan
 RUN mkdir -p "$src_dir"
 
@@ -106,6 +115,7 @@ RUN if [ -z "$BUILD_BASE_IMAGE" ]; then echo "Missing BUILD_BASE_IMAGE --build-a
 
 # Install runtime dependencies
 RUN apt-get update \
+&& apt-get install -y ca-certificates-java \
 && apt-get install -y \
    openjdk-19-jre-headless \
    pigz \

From 579216e34a98eb76c952987881ab237388437a08 Mon Sep 17 00:00:00 2001
From: Roberto Rossini <71787608+robomics@users.noreply.github.com>
Date: Sat, 9 Dec 2023 17:16:54 +0100
Subject: [PATCH 2/2] Update build_dockerfile.sh

---
 utils/devel/build_dockerfile.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/devel/build_dockerfile.sh b/utils/devel/build_dockerfile.sh
index a4f2e980..7f3f9134 100755
--- a/utils/devel/build_dockerfile.sh
+++ b/utils/devel/build_dockerfile.sh
@@ -37,17 +37,17 @@ fi
 sudo docker pull docker.io/library/ubuntu:22.04
 FINAL_BASE_IMAGE_DIGEST="$(sudo docker inspect --format='{{index .RepoDigests 0}}' docker.io/library/ubuntu:22.04 | grep -o '[[:alnum:]:]\+$')"
 
-BUILD_BASE_IMAGE='ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-15:latest'
+BUILD_BASE_IMAGE='ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-17:latest'
 
 sudo docker pull "$BUILD_BASE_IMAGE"
 
-sudo docker build \
+sudo docker buildx build --platform linux/amd64,linux/arm64 \
   --build-arg "BUILD_BASE_IMAGE=$BUILD_BASE_IMAGE" \
   --build-arg "FINAL_BASE_IMAGE=docker.io/library/ubuntu" \
   --build-arg "FINAL_BASE_IMAGE_TAG=22.04" \
   --build-arg "FINAL_BASE_IMAGE_DIGEST=$FINAL_BASE_IMAGE_DIGEST" \
-  --build-arg "C_COMPILER=clang-15" \
-  --build-arg "CXX_COMPILER=clang++-15" \
+  --build-arg "C_COMPILER=clang-17" \
+  --build-arg "CXX_COMPILER=clang++-17" \
   --build-arg "GIT_HASH=$GIT_HASH" \
   --build-arg "GIT_SHORT_HASH=$GIT_SHORT_HASH" \
   --build-arg "GIT_TAG=$GIT_TAG" \