From 6066fee371b0622e23c9ccf7da2ac522feda2fae Mon Sep 17 00:00:00 2001
From: Dmitry Mottl <dmitry.mottl@gmail.com>
Date: Fri, 16 Aug 2024 15:51:01 +0800
Subject: [PATCH 1/2] Adds CMake 3.30.2

---
 linux-micro/Dockerfile | 12 ++++++++++++
 linux/Dockerfile       | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/linux-micro/Dockerfile b/linux-micro/Dockerfile
index 886fcdc..636c490 100644
--- a/linux-micro/Dockerfile
+++ b/linux-micro/Dockerfile
@@ -6,4 +6,16 @@ RUN apt-get update && \
     cat /opt/crates-build-env/packages.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 
+# Install the up-to-date version of CMake
+RUN CMAKE_VERSION="3.30.2" ARCH=$(uname -m) && \
+    curl -s -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${ARCH}.sh && \
+    mkdir /opt/cmake && \
+    sh cmake-${CMAKE_VERSION}-linux-${ARCH}.sh --skip-license --prefix=/opt/cmake && \
+    ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake && \
+    ln -sf /opt/cmake/bin/ccmake /usr/local/bin/ccmake && \
+    ln -sf /opt/cmake/bin/cpack /usr/local/bin/cpack && \
+    ln -sf /opt/cmake/bin/ctest /usr/local/bin/ctest && \
+    rm -rf /opt/cmake/doc && \
+    rm -f cmake-${CMAKE_VERSION}-linux-${ARCH}.sh
+
 CMD ["bash"]
diff --git a/linux/Dockerfile b/linux/Dockerfile
index 004efa1..2ada183 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -6,4 +6,16 @@ RUN apt-get update && \
     cat /opt/crates-build-env/packages.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y && \
     rm -rf /var/lib/apt/lists/*
 
+# Install the up-to-date version of CMake
+RUN CMAKE_VERSION="3.30.2" ARCH=$(uname -m) && \
+    curl -s -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${ARCH}.sh && \
+    mkdir /opt/cmake && \
+    sh cmake-${CMAKE_VERSION}-linux-${ARCH}.sh --skip-license --prefix=/opt/cmake && \
+    ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake && \
+    ln -sf /opt/cmake/bin/ccmake /usr/local/bin/ccmake && \
+    ln -sf /opt/cmake/bin/cpack /usr/local/bin/cpack && \
+    ln -sf /opt/cmake/bin/ctest /usr/local/bin/ctest && \
+    rm -rf /opt/cmake/doc && \
+    rm -f cmake-${CMAKE_VERSION}-linux-${ARCH}.sh
+
 CMD ["bash"]

From 896f09bddd19929693145e2c5e03a688ac2f6b28 Mon Sep 17 00:00:00 2001
From: Dmitry Mottl <dmitry.mottl@gmail.com>
Date: Fri, 16 Aug 2024 16:52:55 +0800
Subject: [PATCH 2/2] Removes CMake from linux-micro

---
 linux-micro/Dockerfile | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/linux-micro/Dockerfile b/linux-micro/Dockerfile
index 636c490..886fcdc 100644
--- a/linux-micro/Dockerfile
+++ b/linux-micro/Dockerfile
@@ -6,16 +6,4 @@ RUN apt-get update && \
     cat /opt/crates-build-env/packages.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 
-# Install the up-to-date version of CMake
-RUN CMAKE_VERSION="3.30.2" ARCH=$(uname -m) && \
-    curl -s -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${ARCH}.sh && \
-    mkdir /opt/cmake && \
-    sh cmake-${CMAKE_VERSION}-linux-${ARCH}.sh --skip-license --prefix=/opt/cmake && \
-    ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake && \
-    ln -sf /opt/cmake/bin/ccmake /usr/local/bin/ccmake && \
-    ln -sf /opt/cmake/bin/cpack /usr/local/bin/cpack && \
-    ln -sf /opt/cmake/bin/ctest /usr/local/bin/ctest && \
-    rm -rf /opt/cmake/doc && \
-    rm -f cmake-${CMAKE_VERSION}-linux-${ARCH}.sh
-
 CMD ["bash"]