dockerfile: ensuring CMake version is not greater than the latest supported one.

Signed-off-by: Marat Abrarov <[email protected]>

Author: mabrarov

dockerfiles/Dockerfile

@@ -41,7 +41,6 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
     build-essential \
     curl \
     ca-certificates \
-    cmake \
     git \
     make \
     tar \
@@ -56,6 +55,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
     flex \
     bison \
     libyaml-dev \
+    && apt-get satisfy -y cmake "cmake (<< 4.0)" \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -254,8 +254,9 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
     net-tools mtr netcat-openbsd bridge-utils iperf ngrep \
     openssl \
     htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
-    cmake make tar flex bison \
+    make tar flex bison \
     libssl-dev libsasl2-dev libsystemd-dev/bookworm-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
+    && apt-get satisfy -y cmake "cmake (<< 4.0)" \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

dockerfiles/Dockerfile.windows

@@ -69,6 +69,29 @@ ENV VCPKG_LIBRARY_LINKAGE=static
 RUN vcpkg install --recurse openssl --triplet x64-windows-static; `
     vcpkg install --recurse libyaml --triplet x64-windows-static;
 
+# CMake of required version
+ENV CMAKE_VERSION="3.31.6" `
+    CMAKE_HOME="C:\cmake" `
+    CMAKE_DOWNLOAD_URL="https://github.com/Kitware/CMake/releases/download"
+RUN if ([System.Version] \"${env:CMAKE_VERSION}\" -ge [System.Version] \"3.20.0\") { `
+        $cmake_dist_base_name=\"cmake-${env:CMAKE_VERSION}-windows-x86_64\" `
+    } else { `
+        if ([System.Version] \"${env:CMAKE_VERSION}\" -ge [System.Version] \"3.6.0\") { `
+            $cmake_dist_base_name=\"cmake-${env:CMAKE_VERSION}-win64-x64\" `
+        } else { `
+            $cmake_dist_base_name=\"cmake-${env:CMAKE_VERSION}-win32-x86\" `
+        } `
+    }; `
+    $cmake_dist_name=\"${cmake_dist_base_name}.zip\"; `
+    $cmake_dist=\"${env:TMP}\${cmake_dist_name}\"; `
+    $cmake_url=\"${env:CMAKE_DOWNLOAD_URL}/v${env:CMAKE_VERSION}/${cmake_dist_name}\"; `
+    Invoke-WebRequest -OutFile \"${cmake_dist}\" \"${cmake_url}\"; `
+    $cmake_temp_dir=\"${env:TMP}\${cmake_dist_base_name}\"; `
+    Expand-Archive \"${cmake_dist}\" -Destination \"${env:TMP}\"; `
+    Remove-Item -Force \"${cmake_dist}\"; `
+    [System.IO.Directory]::Move(\"${cmake_temp_dir}\", \"${env:CMAKE_HOME}\"); `
+    Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value \"${env:CMAKE_HOME}\bin;${env:PATH}\"
+
 FROM builder-base AS builder
 
 # Build Fluent Bit from source - context must be the root of the Git repo