From 2ba41654bd6e5f5ab152dc08280b57127c2aace5 Mon Sep 17 00:00:00 2001
From: hn-88 <hn-88@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:18:44 +0530
Subject: [PATCH 1/3] Update Dockerfile with cmake install from source

---
 run/ubuntu-2204/Dockerfile | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/run/ubuntu-2204/Dockerfile b/run/ubuntu-2204/Dockerfile
index 3ff1193..318271f 100644
--- a/run/ubuntu-2204/Dockerfile
+++ b/run/ubuntu-2204/Dockerfile
@@ -60,17 +60,15 @@ RUN apt install -y gcc-11 g++-11 && \
     apt install -y libpng-dev && \
     apt install -y libcurl4-openssl-dev
 #Install latest version of CMake (ubuntu's default is too old)
-RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
-RUN apt update -y && \
-    apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \
-    apt update -y && \
-    rm /usr/share/keyrings/kitware-archive-keyring.gpg && \
-    apt install -y kitware-archive-keyring
-RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy-rc main' | sudo tee -a /etc/apt/sources.list.d/kitware.list >/dev/null
-RUN apt update -y
-RUN apt install -y cmake && \
-    apt install -y cmake-curses-gui
+#cmake < 4.0 is known to work
+#Install CMake 3.26.4 from source
+RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz && \
+              tar -xf cmake-3.26.4.tar.gz && \
+              cd cmake-3.26.4 && \
+              ./bootstrap -- -DCMAKE_USE_OPENSSL=ON && \
+              make -j\$(nproc) && \
+              make install && \
+              cd .. && rm -rf cmake-3.26.4*
 #Build OpenSpace
 RUN su openspace; \
     chown -R openspace:openspace .; \

From 684c91f2b9c9df9540f7d2e4dabcb2b4315c9876 Mon Sep 17 00:00:00 2001
From: hn-88 <hn-88@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:21:11 +0530
Subject: [PATCH 2/3] Update gcc from 11 to 13

required by the latest openspace
---
 run/ubuntu-2204/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/run/ubuntu-2204/Dockerfile b/run/ubuntu-2204/Dockerfile
index 318271f..576ee25 100644
--- a/run/ubuntu-2204/Dockerfile
+++ b/run/ubuntu-2204/Dockerfile
@@ -53,8 +53,8 @@ RUN echo "user ALL=(ALL) ALL" >> /etc/sudoers && \
     apt install -y software-properties-common && \
     add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt update -y
-RUN apt install -y gcc-11 g++-11 && \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 --slave /usr/bin/g++ g++ /usr/bin/g++-11 && \
+RUN apt install -y gcc-13 g++-13 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60 --slave /usr/bin/g++ g++ /usr/bin/g++-13 && \
     update-alternatives --config gcc && \
     apt install -y glew-utils && \
     apt install -y libpng-dev && \
@@ -78,8 +78,8 @@ RUN su openspace; \
     mkdir /home/openspace/source/OpenSpace/build; \
     cd /home/openspace/source/OpenSpace/build; \
     cmake -DCMAKE_BUILD_TYPE:STRING="Release" \
-    -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-11 \
-    -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-11 \
+    -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-13 \
+    -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-13 \
     -DASSIMP_BUILD_MINIZIP=1 /home/openspace/source/OpenSpace; \
     make -j4
 

From ed04938a960d15b1edd8348ba1814a3b6b272ca7 Mon Sep 17 00:00:00 2001
From: hn-88 <hn-88@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:28:53 +0530
Subject: [PATCH 3/3] use make -j4 to avoid unexpected ( error

---
 run/ubuntu-2204/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/ubuntu-2204/Dockerfile b/run/ubuntu-2204/Dockerfile
index 576ee25..d3f1056 100644
--- a/run/ubuntu-2204/Dockerfile
+++ b/run/ubuntu-2204/Dockerfile
@@ -66,7 +66,7 @@ RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.2
               tar -xf cmake-3.26.4.tar.gz && \
               cd cmake-3.26.4 && \
               ./bootstrap -- -DCMAKE_USE_OPENSSL=ON && \
-              make -j\$(nproc) && \
+              make -j4 && \
               make install && \
               cd .. && rm -rf cmake-3.26.4*
 #Build OpenSpace