From 5503b96a926ff91186254c9c3a0aaf5195fc89dc Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sun, 6 Apr 2025 19:07:32 +0100 Subject: [PATCH 1/3] Update dev-container src to use cmake 3.31.6 --- .devcontainer/All/Dockerfile.All.SRC | 2 +- .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC | 2 +- .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC | 2 +- .devcontainer/ESP32/Dockerfile.ESP32.SRC | 2 +- .devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC | 2 +- .devcontainer/TI/Dockerfile.TI.SRC | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC index d934ee2ddc..2c974a9dd9 100644 --- a/.devcontainer/All/Dockerfile.All.SRC +++ b/.devcontainer/All/Dockerfile.All.SRC @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && 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_VERSION=3.31.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 \ diff --git a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC index f61ae04792..2dcbec63f6 100644 --- a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC +++ b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && 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_VERSION=3.31.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 \ diff --git a/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC b/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC index 25d0827422..71ef080b82 100644 --- a/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC +++ b/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && 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_VERSION=3.31.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 \ diff --git a/.devcontainer/ESP32/Dockerfile.ESP32.SRC b/.devcontainer/ESP32/Dockerfile.ESP32.SRC index 6b45f70a80..d3656b1f6d 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32.SRC +++ b/.devcontainer/ESP32/Dockerfile.ESP32.SRC @@ -9,7 +9,7 @@ RUN apt-get update \ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted -ARG CMAKE_VERSION=3.27.6 +ARG CMAKE_VERSION=3.31.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 \ diff --git a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC index 77755782c8..bdad97d699 100644 --- a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC +++ b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && 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_VERSION=3.31.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 \ diff --git a/.devcontainer/TI/Dockerfile.TI.SRC b/.devcontainer/TI/Dockerfile.TI.SRC index d93b95fed1..445aca2f32 100644 --- a/.devcontainer/TI/Dockerfile.TI.SRC +++ b/.devcontainer/TI/Dockerfile.TI.SRC @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && 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_VERSION=3.31.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 \ From 174998a1746cd83ed5fd0bc10964f3f4a2197554 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sun, 6 Apr 2025 19:36:38 +0100 Subject: [PATCH 2/3] Bump container versions --- .devcontainer/All/Dockerfile.All | 2 +- .devcontainer/AzureRTOS/Dockerfile.AzureRTOS | 2 +- .devcontainer/ChibiOS/Dockerfile.ChibiOS | 2 +- .devcontainer/ESP32/Dockerfile.ESP32 | 2 +- .devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP | 2 +- .devcontainer/TI/Dockerfile.TI | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/All/Dockerfile.All b/.devcontainer/All/Dockerfile.All index 32cf48ba94..e42e4a2748 100644 --- a/.devcontainer/All/Dockerfile.All +++ b/.devcontainer/All/Dockerfile.All @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-all:v2.55 +FROM ghcr.io/nanoframework/dev-container-all:v2.56 diff --git a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS index b701faac63..7b34de6e73 100644 --- a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS +++ b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.32 +FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.33 diff --git a/.devcontainer/ChibiOS/Dockerfile.ChibiOS b/.devcontainer/ChibiOS/Dockerfile.ChibiOS index d8dc9ff90f..3b6b503b83 100644 --- a/.devcontainer/ChibiOS/Dockerfile.ChibiOS +++ b/.devcontainer/ChibiOS/Dockerfile.ChibiOS @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-chibios:v1.33 +FROM ghcr.io/nanoframework/dev-container-chibios:v1.34 diff --git a/.devcontainer/ESP32/Dockerfile.ESP32 b/.devcontainer/ESP32/Dockerfile.ESP32 index 8269826ac5..4cdc5ea9fd 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32 +++ b/.devcontainer/ESP32/Dockerfile.ESP32 @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-esp32:v2.35 +FROM ghcr.io/nanoframework/dev-container-esp32:v2.36 diff --git a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP index 62ef405149..4ba5bcd4f7 100644 --- a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP +++ b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.05 +FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.06 diff --git a/.devcontainer/TI/Dockerfile.TI b/.devcontainer/TI/Dockerfile.TI index 030c60aa4f..da57956e29 100644 --- a/.devcontainer/TI/Dockerfile.TI +++ b/.devcontainer/TI/Dockerfile.TI @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-ti:v1.26 +FROM ghcr.io/nanoframework/dev-container-ti:v1.27 From 6025132d37f098de0e338a4abff3ab596eef7a8b Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sun, 6 Apr 2025 19:44:56 +0100 Subject: [PATCH 3/3] Update Dockerfile.All.SRC Minor comment fix --- .devcontainer/All/Dockerfile.All.SRC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC index 2c974a9dd9..b19e5ba68b 100644 --- a/.devcontainer/All/Dockerfile.All.SRC +++ b/.devcontainer/All/Dockerfile.All.SRC @@ -26,7 +26,7 @@ RUN wget $CMAKE_SCRIPT \ && /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 +# This is TI XDC tools for linux. Check 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 \