From bc6d390fb6ee56e68345c21027ecbbfd913f78ba Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sun, 24 Mar 2024 18:49:11 -0700 Subject: [PATCH] bionic docker: fixing cmake version for arm --- docker/bionic/Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile index b6e07f449b..9547d7b8f4 100644 --- a/docker/bionic/Dockerfile +++ b/docker/bionic/Dockerfile @@ -25,11 +25,16 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} RUN echo "I am building for $TARGETPLATFORM" # cmake >=3.14 required -RUN apt update && apt install -y wget && apt-get clean && rm -rf /var/lib/apt/lists/ && \ - wget -nv https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.tar.gz && \ - tar -xzf cmake-3.17.0-Linux-x86_64.tar.gz && \ - rm cmake-3.17.0-Linux-x86_64.tar.gz &&\ - ln -s ~/cmake-3.17.0-Linux-x86_64/bin/cmake ~/cmake; fi +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then apt update && apt install -y wget && apt-get clean && rm -rf /var/lib/apt/lists/ && \ + wget -nv https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-aarch64.tar.gz && \ + tar -xzf cmake-3.20.0-linux-aarch64.tar.gz && \ + rm cmake-3.20.0-linux-aarch64.tar.gz &&\ + ln -s ~/cmake-3.20.0-linux-aarch64/bin/cmake ~/cmake; fi +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then apt update && apt install -y wget && apt-get clean && rm -rf /var/lib/apt/lists/ && \ + wget -nv https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-x86_64.tar.gz && \ + tar -xzf cmake-3.20.0-linux-x86_64.tar.gz && \ + rm cmake-3.20.0-linux-x86_64.tar.gz &&\ + ln -s ~/cmake-3.20.0-linux-x86_64/bin/cmake ~/cmake; fi #commit Aug 6 2020 RUN apt-get update && apt install wget && apt-get clean && rm -rf /var/lib/apt/lists/