Skip to content

Commit

Permalink
Fix Dockerfile ARM builds
Browse files Browse the repository at this point in the history
  • Loading branch information
robomics committed Dec 9, 2023
1 parent 73da27e commit 8114620
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 8114620

Please sign in to comment.