From f694137aa4e504afe0ebc7935916cee4ac04b198 Mon Sep 17 00:00:00 2001 From: Lukas Senionis Date: Fri, 19 Jul 2024 19:14:59 +0300 Subject: [PATCH] feat: Use CMake 3.30 for Ubuntu 22.04 docker (#2898) --- docker/ubuntu-22.04.dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile index 70524cdf472..9ccf75687dd 100644 --- a/docker/ubuntu-22.04.dockerfile +++ b/docker/ubuntu-22.04.dockerfile @@ -67,6 +67,27 @@ apt-get clean rm -rf /var/lib/apt/lists/* _DEPS +# install cmake +# sunshine requires cmake >= 3.25 +WORKDIR /build/cmake +# https://cmake.org/download/ +ENV CMAKE_VERSION="3.30.1" +# hadolint ignore=SC3010 +RUN <<_INSTALL_CMAKE +#!/bin/bash +cmake_prefix="https://github.com/Kitware/CMake/releases/download/v" +if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then + cmake_arch="x86_64" +elif [[ "${TARGETPLATFORM}" == 'linux/arm64' ]]; then + cmake_arch="aarch64" +fi +url="${cmake_prefix}${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${cmake_arch}.sh" +echo "cmake url: ${url}" +wget "$url" --progress=bar:force:noscroll -q --show-progress -O ./cmake.sh +sh ./cmake.sh --prefix=/usr/local --skip-license +cmake --version +_INSTALL_CMAKE + #Install Node # hadolint ignore=SC1091 RUN <<_INSTALL_NODE