From 2812905a8c0fc14987130024e631118f6d54bc99 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Fri, 8 Nov 2024 13:52:12 -0500 Subject: [PATCH] update dockerfile installed cmake version to 3.27 --- docker-build-v2/amd64-linux/Dockerfile | 2 +- docker-build-v2/amd64-windows/Dockerfile | 2 +- docker-build/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-build-v2/amd64-linux/Dockerfile b/docker-build-v2/amd64-linux/Dockerfile index 39508b8965..0af01bb1e8 100644 --- a/docker-build-v2/amd64-linux/Dockerfile +++ b/docker-build-v2/amd64-linux/Dockerfile @@ -33,7 +33,7 @@ RUN git clone --depth 1 --branch v1.5.6 https://github.com/facebook/zstd.git \ RUN pip3 install --upgrade pip \ && pip3 install scikit-build \ - && pip3 install cmake==3.25.* + && pip3 install cmake==3.27.* WORKDIR /build RUN mkdir src cache out artifacts && chmod a+rwx cache out artifacts diff --git a/docker-build-v2/amd64-windows/Dockerfile b/docker-build-v2/amd64-windows/Dockerfile index 76ea7582a2..677c0dd5bd 100644 --- a/docker-build-v2/amd64-windows/Dockerfile +++ b/docker-build-v2/amd64-windows/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Using `pipx --global` would be better but it's available only since pipx 1.5 -RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install cmake==3.25.* +RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install cmake==3.27.* WORKDIR /build RUN mkdir src cache out artifacts && chmod a+rwx cache out artifacts diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index b722bad8b1..f1fefb40b7 100644 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update;apt-get install -y \ sed \ unzip \ wget \ - xz-utils + xz-utils # Install MXE and build cross-compile windows gcc RUN cd /; \ @@ -49,7 +49,7 @@ RUN cd /; \ # Main Image FROM ubuntu:18.04 -ARG cmake_version=3.25.* +ARG cmake_version=3.27.* ARG ccache_version="v4.5.1" COPY --from=mxe /mxe /mxe