From f3fac5b8c10c4961f53f148c52576e8fc66b9e84 Mon Sep 17 00:00:00 2001
From: Paulius Vitkus <pauvitk@gmail.com>
Date: Tue, 5 Mar 2024 18:14:16 +0200
Subject: [PATCH] Update cmake minimum version to 3.20 on all platforms

---
 CMakeLists.txt         |  6 +-----
 scripts/qns.Dockerfile | 14 +++++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30c4a5721a..5706fb0685 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-    cmake_minimum_required(VERSION 3.20)
-else()
-    cmake_minimum_required(VERSION 3.16)
-endif()
+cmake_minimum_required(VERSION 3.20)
 
 # Disable in-source builds to prevent source tree corruption.
 if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
diff --git a/scripts/qns.Dockerfile b/scripts/qns.Dockerfile
index e1a91d4eae..3bb9041b54 100644
--- a/scripts/qns.Dockerfile
+++ b/scripts/qns.Dockerfile
@@ -1,11 +1,15 @@
 FROM    martenseemann/quic-network-simulator-endpoint@sha256:2ec0a19a54f4547f068a81afcb3e92251b8808934eb86e5cb6919d91c4958791 as source
 ENV     DEBIAN_FRONTEND=noninteractive
 RUN     apt-get update -y \
-            && apt-get install -y \
-            build-essential \
-            cmake \
-            liblttng-ust-dev \
-            libnuma-dev \
+            && apt-get install -y ca-certificates gpg wget \
+            && test -f /usr/share/doc/kitware-archive-keyring/copyright \
+            || wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
+            && echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
+            && apt-get update -y \
+            && test -f /usr/share/doc/kitware-archive-keyring/copyright \
+            || rm /usr/share/keyrings/kitware-archive-keyring.gpg \
+            && apt-get install -y kitware-archive-keyring \
+            && apt-get install -y build-essential cmake liblttng-ust-dev libnuma-dev \
             && apt-get clean
 COPY    . /src