Improve Dockerfiles (#2825)

Author: networkfusion

.devcontainer/Dockerfile.All

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-all:v2.42
+FROM ghcr.io/nanoframework/dev-container-all:v2.43

.devcontainer/Dockerfile.AzureRTOS

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.24
+FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.25

.devcontainer/Dockerfile.ChibiOS

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-chibios:v1.25
+FROM ghcr.io/nanoframework/dev-container-chibios:v1.26

.devcontainer/Dockerfile.ESP32

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-esp32:v2.27
+FROM ghcr.io/nanoframework/dev-container-esp32:v2.28

.devcontainer/Dockerfile.TI

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-ti:v1.20
+FROM ghcr.io/nanoframework/dev-container-ti:v1.21

.devcontainer/scripts/git-pull-repos.sh

@@ -23,7 +23,7 @@ git pull origin V10.4.1-kernel-only
 cd /sources/CMSIS_5
 git pull origin 5.5.1
 cd /sources/lwip
-git pull origin STABLE-2_1_3_RELEASE # FIXME: if the NXP targets still require STABLE-2_0_3_RELEASE as this is quite old now.
+git pull origin STABLE-2_1_3_RELEASE
 cd /sources/spiffs
 git pull origin nf-build
 cd /sources/SimpleLinkCC32

.devcontainer/sources/Dockerfile.All

@@ -5,30 +5,34 @@ RUN apt-get update \
     curl \
     xz-utils \
     unzip \
-    wget 
+    wget
 
-ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted
+
+ARG GCC_VERSION=13.2.rel1
+ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-x86_64-arm-none-eabi.tar.xz
 RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
     && curl -o /tmp/dc-downloads/gcc-arm.tar.xz  $GCC_URI \
     && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
     && tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
     && rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
 
+ARG CMAKE_VERSION=3.27.6
+ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
+RUN wget $CMAKE_SCRIPT \
+    -q -O /tmp/dc-downloads/cmake-install.sh \
+    && chmod u+x /tmp/dc-downloads/cmake-install.sh \
+    && mkdir -p /tmp/dc-extracted/cmake \
+    && /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
+    && rm /tmp/dc-downloads/cmake-install.sh
+
 # This is TI XDC tools for linux. Cheack all versions here: https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
 ARG TI_TOOL_URL=https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/3_62_00_08/exports/xdccore/xdctools_3_62_00_08_core_linux.zip
 RUN  mkdir -p /tmp/dc-extracted/titools \
     && curl -o /tmp/dc-downloads/titools.zip $TI_TOOL_URL -L \
     && unzip -d /tmp/dc-extracted/titools /tmp/dc-downloads/titools.zip
 
-ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
-RUN wget $CMAKE_SCRIPT \
-      -q -O /tmp/cmake-install.sh \
-      && chmod u+x /tmp/cmake-install.sh \
-      && mkdir /tmp/dc-extracted/cmake \
-      && /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
-      && rm /tmp/cmake-install.sh
-
-FROM ubuntu:latest AS devcontainer
+FROM python:3.10 AS devcontainer
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -53,40 +57,37 @@ RUN apt-get update \
     nodejs \
     libffi-dev
 
-# Set Python 10 as the default version
-RUN apt-get install -y software-properties-common \
-    && add-apt-repository ppa:deadsnakes/ppa \
-    && apt-get update \
-    && apt-get install -y python3.10 \
-    python3-pip
-
 # Create needed directories
 RUN mkdir -p /usr/local/bin/gcc \
     && mkdir -p /usr/local/bin/titools
 
 # Clone ChibiOS repo
-RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs
+# RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs
 # Alternative source for those having issues with git svn downloads:
-# RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
+RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
 
 # Clone support repos for STM32 including AzureRTOS
 RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
-    && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
-    && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo \
     && git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 
-# Clone libs mbedtls and fatfs etc.
+# Clone repos for AzureRTOS
+RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
+    && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
+
+# Clone dependent repos (mbedtls, fatfs and spiffs)
 RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
-    && git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
+    && git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
 
 # Clone FreeRTOS and what is needed for ESP32
 RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \
-    && git clone --branch 5.5.1 https://github.com/ARM-software/CMSIS_5.git --depth 1 ./sources/CMSIS_5 \
-    && git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
+    && git clone --branch 5.5.1 https://github.com/ARM-software/CMSIS_5.git --depth 1 ./sources/CMSIS_5
+
+# Clone lwIP for STM32 and NXP
+RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
 
 # Clone ESP-IDF
 RUN git clone --branch v4.4.6 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
@@ -100,11 +101,11 @@ RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC
     && chmod +x ./sources/TI_SysConfig/sysconfig_cli.sh
 
 # set gcc location
-ENV ARM_GCC_PATH=/usr/local/bin/gcc
-ENV PATH=$ARM_GCC_PATH/bin:${PATH}
+ARG TMP_GCC_PATH=/usr/local/bin/gcc
+ENV ARM_GCC_PATH=$TMP_GCC_PATH/bin
 
 # Copy from our other container
-COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
+COPY --from=downloader /tmp/dc-extracted/gcc $TMP_GCC_PATH
 COPY --from=downloader /tmp/dc-extracted/titools/xdctools_3_62_00_08_core /usr/local/bin/titools
 COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
 
@@ -113,7 +114,7 @@ ENV PATH=/usr/bin/cmake/bin:${PATH}
 # Putting hex2dfu in the container
 ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
 
-ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
+ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/latest/download/hex2dfu
 RUN mkdir -p  $HEX2DFU_PATH \
     && curl -o  $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
     && chmod +x  $HEX2DFU_PATH/hex2dfu

.devcontainer/sources/Dockerfile.AzureRTOS

@@ -5,22 +5,26 @@ RUN apt-get update \
     curl \
     xz-utils \
     unzip \
-    wget 
+    wget
 
-ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted
+
+ARG GCC_VERSION=13.2.rel1
+ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-x86_64-arm-none-eabi.tar.xz
 RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
     && curl -o /tmp/dc-downloads/gcc-arm.tar.xz  $GCC_URI \
     && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
     && tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
     && rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
 
-ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
+ARG CMAKE_VERSION=3.27.6
+ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
 RUN wget $CMAKE_SCRIPT \
-      -q -O /tmp/cmake-install.sh \
-      && chmod u+x /tmp/cmake-install.sh \
-      && mkdir /tmp/dc-extracted/cmake \
-      && /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
-      && rm /tmp/cmake-install.sh
+    -q -O /tmp/dc-downloads/cmake-install.sh \
+    && chmod u+x /tmp/dc-downloads/cmake-install.sh \
+    && mkdir -p /tmp/dc-extracted/cmake \
+    && /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
+    && rm /tmp/dc-downloads/cmake-install.sh
 
 FROM ubuntu:latest AS devcontainer
 
@@ -47,34 +51,40 @@ RUN apt-get update \
 # Create needed directories
 RUN mkdir -p /usr/local/bin/gcc
 
-# Clone repos for STM32 including AzureRTOS
-RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
-    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
+# Clone ChibiOS repo (used for HAL)
+# RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs
+# Alternative source for those having issues with git svn downloads:
+RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
+
+# Clone repos for STM32
+RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
-    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
-    && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
+    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7
+
+# Clone repos for AzureRTOS
+RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
     && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
 
-# Clone mbedtls and fatfs
+# Clone dependent repos (mbedtls, fatfs and spiffs)
 RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
 
 # set gcc location
-ENV ARM_GCC_PATH=/usr/local/bin/gcc
-ENV PATH=$ARM_GCC_PATH/bin:${PATH}
+ARG TMP_GCC_PATH=/usr/local/bin/gcc
+ENV ARM_GCC_PATH=$TMP_GCC_PATH/bin
 
 # Copy from our other container
-COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
+COPY --from=downloader /tmp/dc-extracted/gcc $TMP_GCC_PATH
 COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
 
 ENV PATH=/usr/bin/cmake/bin:${PATH}
 
 # Putting hex2dfu in the container
 ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
 
-ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
+ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/latest/download/hex2dfu
 RUN mkdir -p  $HEX2DFU_PATH \
     && curl -o  $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
     && chmod +x  $HEX2DFU_PATH/hex2dfu

.devcontainer/sources/Dockerfile.ChibiOS

@@ -5,22 +5,26 @@ RUN apt-get update \
     curl \
     xz-utils \
     unzip \
-    wget 
+    wget
 
-ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted
+
+ARG GCC_VERSION=13.2.rel1
+ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-x86_64-arm-none-eabi.tar.xz
 RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
     && curl -o /tmp/dc-downloads/gcc-arm.tar.xz  $GCC_URI \
     && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
     && tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
     && rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
 
-ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
+ARG CMAKE_VERSION=3.27.6
+ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
 RUN wget $CMAKE_SCRIPT \
-      -q -O /tmp/cmake-install.sh \
-      && chmod u+x /tmp/cmake-install.sh \
-      && mkdir /tmp/dc-extracted/cmake \
-      && /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
-      && rm /tmp/cmake-install.sh
+    -q -O /tmp/dc-downloads/cmake-install.sh \
+    && chmod u+x /tmp/dc-downloads/cmake-install.sh \
+    && mkdir -p /tmp/dc-extracted/cmake \
+    && /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
+    && rm /tmp/dc-downloads/cmake-install.sh
 
 FROM ubuntu:latest AS devcontainer
 
@@ -45,41 +49,41 @@ RUN apt-get update \
     srecord
 
 # Create needed directories
-RUN mkdir -p /usr/local/bin/GCC_URI
+RUN mkdir -p /usr/local/bin/gcc
 
 
 # Clone ChibiOS repo
-RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs
+# RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs
 # Alternative source for those having issues with git svn downloads:
-# RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
+RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
 
-# Clone support repos for STM32 including AzureRTOS
+# Clone support repos for STM32
 RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
-    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \    
+    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
     && git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 
-# Clone libs including mbedtls and fatfs
+# Clone dependent repos (mbedtls, fatfs and spiffs etc.)
 RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs \
     && git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
 
 # set gcc location
-ENV ARM_GCC_PATH=/usr/local/bin/gcc
-ENV PATH=$ARM_GCC_PATH/bin:${PATH}
+ARG TMP_GCC_PATH=/usr/local/bin/gcc
+ENV ARM_GCC_PATH=$TMP_GCC_PATH/bin
 
 # Copy from our other container
-COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
+COPY --from=downloader /tmp/dc-extracted/gcc $TMP_GCC_PATH
 COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
 
 ENV PATH=/usr/bin/cmake/bin:${PATH}
 
 # Putting hex2dfu in the container
 ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
 
-ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
+ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/latest/download/hex2dfu
 RUN mkdir -p  $HEX2DFU_PATH \
     && curl -o  $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
     && chmod +x  $HEX2DFU_PATH/hex2dfu

.devcontainer/sources/Dockerfile.ESP32

@@ -7,17 +7,18 @@ RUN apt-get update \
     unzip \
     wget 
 
-RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc
+RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted
 
-ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
+ARG CMAKE_VERSION=3.27.6
+ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
 RUN wget $CMAKE_SCRIPT \
-      -q -O /tmp/cmake-install.sh \
-      && chmod u+x /tmp/cmake-install.sh \
-      && mkdir /tmp/dc-extracted/cmake \
-      && /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
-      && rm /tmp/cmake-install.sh
+    -q -O /tmp/dc-downloads/cmake-install.sh \
+    && chmod u+x /tmp/dc-downloads/cmake-install.sh \
+    && mkdir -p /tmp/dc-extracted/cmake \
+    && /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
+    && rm /tmp/dc-downloads/cmake-install.sh
 
-FROM ubuntu:latest AS devcontainer
+FROM python:3.10 AS devcontainer
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -40,13 +41,6 @@ RUN apt-get update \
     nodejs \
     libffi-dev
 
-# Set Python 10 as the default version
-RUN apt-get install -y software-properties-common \
-    && add-apt-repository ppa:deadsnakes/ppa \
-    && apt-get update \
-    && apt-get install -y python3.10 \
-    python3-pip
-
 # Create needed directories
 RUN mkdir -p /usr/local/bin/gcc