Skip to content

Commit 0d592fd

Browse files
Updated packages: GNU Arm Toolchain 14.3rel1, CMake 4.0.3, JLink 8.54; Removed deprecated .NET and unmaintained extension
1 parent 692558a commit 0d592fd

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

Dockerfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
WORKDIR /tmp
2626

2727
#- CMake -----------------------------------------------------------------------
28-
ARG CMAKE_VERSION=4.0.0
28+
ARG CMAKE_VERSION=4.0.3
2929
ARG CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz"
3030
ARG CMAKE_HASH="https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-SHA-256.txt"
3131

@@ -36,21 +36,15 @@ RUN curl -sLO ${CMAKE_URL} && \
3636
rm $(basename "${CMAKE_URL}")
3737

3838
#- .NET 6 Runtime --------------------------------------------------------------
39-
ARG DOTNET_VERSION=6.0.36
40-
ARG DOTNET_URL="https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz"
41-
ARG DOTNET_SHA512="afb6018fcabec468ccd7ae2f1131d8c9de7f4de7645b8f0c223efbbdbfdc515fb0642a399ebfe372c02044416c4cae463c9c802cd156b9da4181efff0e33ee94"
4239
ARG DOTNET_INSTALL_DIR="/opt/dotnet"
4340

44-
# Download and install package
45-
RUN curl -sLO ${DOTNET_URL} && \
46-
echo "${DOTNET_SHA512} $(basename ${DOTNET_URL})" | sha512sum -c - && \
47-
mkdir -p ${DOTNET_INSTALL_DIR} && \
48-
tar -xf $(basename "${DOTNET_URL}") -C ${DOTNET_INSTALL_DIR} --strip-components=1 && \
49-
rm $(basename "${DOTNET_URL}")
41+
# Display warning for tools still using deprecated .NET version
42+
ADD dotnet-info.sh ${DOTNET_INSTALL_DIR}/
43+
RUN ln -s ${DOTNET_INSTALL_DIR}/dotnet-info.sh ${DOTNET_INSTALL_DIR}/dotnet
5044
ENV PATH=$PATH:${DOTNET_INSTALL_DIR}
5145

5246
#- Arm GNU Toolchain -----------------------------------------------------------
53-
ARG TOOLCHAIN_VERSION=14.2.rel1
47+
ARG TOOLCHAIN_VERSION=14.3.rel1
5448
ARG TOOLCHAIN_URL="https://developer.arm.com/-/media/Files/downloads/gnu/$TOOLCHAIN_VERSION/binrel/arm-gnu-toolchain-$TOOLCHAIN_VERSION-x86_64-arm-none-eabi.tar.xz"
5549
ARG TOOLCHAIN_INSTALL_DIR="/opt/gcc-arm-none-eabi"
5650

@@ -72,9 +66,9 @@ COPY gcc-arm-none-eabi.cmake ${TOOLCHAIN_INSTALL_DIR}
7266
ENV PATH=$PATH:${TOOLCHAIN_INSTALL_DIR}/bin
7367

7468
#- JLink Debugger --------------------------------------------------------------
75-
ARG JLINK_VERSION=824
69+
ARG JLINK_VERSION=854
7670
ARG JLINK_URL="https://www.segger.com/downloads/jlink/JLink_Linux_V${JLINK_VERSION}_x86_64.tgz"
77-
ARG JLINK_MD5="9248e78ee425bd366988057a91113248"
71+
ARG JLINK_MD5="0a252f2df1aef57af4128ece7b4baa9d"
7872
ARG JLINK_POST="accept_license_agreement=accepted&submit=Download+software"
7973
ARG JLINK_INSTALL_DIR="/opt/SEGGER/JLink"
8074

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
![Screenshot](scr.PNG)
77

88
### Packages
9-
* [Microsoft .NET 6.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) Version 6.0.36
10-
* [Arm GNU Toolchain](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads) Version 14.2rel1
11-
* [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/) Version 8.24
9+
* [Arm GNU Toolchain](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads) Version 14.3rel1
10+
* [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/) Version 8.54
1211
* [xPack OpenOCD](https://github.com/xpack-dev-tools/openocd-xpack) Version 0.12.0-6
13-
* [CMake](https://cmake.org/download) Version 4.0.0
12+
* [CMake](https://cmake.org/download) Version 4.0.3
1413

1514
## System Requirements
1615
* VSCode [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension

cmake-tools-kits.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"name": "Arm GNU Toolchain 14.2rel1",
3+
"name": "Arm GNU Toolchain 14.3rel1",
44
"toolchainFile": "/opt/gcc-arm-none-eabi/gcc-arm-none-eabi.cmake"
55
}
66
]

devcontainer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,10 @@
4848
"C_Cpp.default.intelliSenseMode": "linux-gcc-arm",
4949

5050
"cmake.configureOnOpen": true,
51-
"cmake.languageSupport.dotnetPath": "/opt/dotnet/dotnet",
52-
"cmake.languageSupport.enableFileAPI": true,
5351
"cmake.additionalKits": [ "/opt/devcontainer/cmake-tools-kits.json" ]
5452
},
5553
"extensions": [
5654
"dan-c-underwood.arm",
57-
"josetr.cmake-language-support-vscode",
5855
"keroc.hex-fmt",
5956
"marus25.cortex-debug",
6057
"mcu-debug.peripheral-viewer",

dotnet-info.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
echo "The .NET 6 installation previously included with this container is deprecated. Please install and use a current version: https://dotnet.microsoft.com/" 1>&2
4+
exit 1

0 commit comments

Comments
 (0)