Baremetal ARM image (Compiler 14.2.Rel1)

* ARM GCC 14.2.Rel1 (arm-none-eabi)
* OpenOCD 0.12.0-6
* st-link 1.8.0
* pyocd 0.36.0
* pyocd packs for ST and nRF
* python 3.8 and 3.12
* STM32CubeProgrammer 2.13.0 (CLI)
* orbuculum 2.2.0
* clangd 20.1.0

Close: #12

Author: rapgenic

README.md

@@ -39,7 +39,7 @@ To use a devcontainer inside your project you have to:
 2. In this folder add a `devcontainer.json`, with the following content:
 	```json
 	{
-		"image": "ghcr.io/protech-engineering/devcontainers:barearm-12.2.Rel1"
+		"image": "ghcr.io/protech-engineering/devcontainers:barearm-14.2.Rel1"
 	}
 	```
 3. Open the command palette (`CTRL+SHIFT+P` or `F1`), search and run "Dev Containers: Reopen in Container".
@@ -48,7 +48,7 @@ To use a devcontainer inside your project you have to:
 
 | Name | Tagging convention | Latest version | Notes |
 |------|--------------------|----------------|------|
-| barearm | `barearm-[ARM toolchain version]` | `12.2.Rel1` | This image implements basic support for ARM bare metal targets. The latest version contains: <br><ul><li>ARM GCC 12.2.Rel1 (arm-none-eabi)</li><li>OpenOCD 0.12.0-1</li><li>st-link 1.7.0</li><li>pyocd 0.35.1</li><li>pyocd packs for ST and nRF</li><li>python 3.8 and 3.10</li><li>STM32CubeProgrammer 2.13.0 (CLI)</li><li>orbuculum 2.1.0</li><li>clangd 16.0.2</li></ul> |
+| barearm | `barearm-[ARM toolchain version]` | `14.2.Rel1` | This image implements basic support for ARM bare metal targets. The latest version contains: <br><ul><li>ARM GCC 14.2.Rel1 (arm-none-eabi)</li><li>OpenOCD 0.12.0-6</li><li>st-link 1.8.0</li><li>pyocd 0.36.0</li><li>pyocd packs for ST and nRF</li><li>python 3.8 and 3.12</li><li>STM32CubeProgrammer 2.13.0 (CLI)</li><li>orbuculum 2.2.0</li><li>clangd 20.0.1</li></ul> |
 | barearmgui | `barearmgui-[ARM toolchain version]` | `11.3.Rel1` | This image inherits the `barearm` image. The latest version contains the following additional packages for GUI development: <br><ul><li>GCC 11.3.0 (x86-64)</li><li>mingw w64 10-win32</li><li>SDL2 + Image module (native + mingw)</li><li>Emscripten 3.1.5</li></ul> |
 | barearmnordic | `barearmnordic-[ARM toolchain version]` | `9_2019_q4_major` | This image inherits the `barearm` image. The latest version contains the following additional packages for nRF-SDK (old version) development: <br><ul><li>protobuf 3.19.0</li><li>nrfutil 6.1.6</li><li>ble-serial</li></ul> |
 | esp | *still in beta* | NA | This image inherits the ESP32 docker image and adds our default tools and devcontainer settings |
@@ -106,7 +106,7 @@ Variant names and versions must not contain any `-` character (dash), because it
 		Now you can start the image with the command:
 
 		```bash
-		$ npx @devcontainers/cli up --workspace-folder [variant]
+		$ npx @devcontainers/cli up --remove-existing-container --workspace-folder [variant]
 		```
 
 		And execute a command (for example starting a shell to explore the contents):
@@ -167,4 +167,4 @@ If everything is done you can release a new stable image:
 		}
 	},
 	```
-	This will add al the needed packages to make it usable as a devcontainer, even if it's not derived from a `devcontainer/base` image.
+	This will add al the needed packages to make it usable as a devcontainer, even if it's not derived from a `devcontainer/base` image.

barearm/.devcontainer/Dockerfile

@@ -1,69 +1,80 @@
-FROM ubuntu:22.04 AS orbuculum_build
+FROM ubuntu:24.04 AS orbuculum_build
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
-	apt-get -y install git build-essential curl libusb-1.0-0-dev libczmq-dev libncurses-dev meson libsdl2-dev
+	apt-get -y install git build-essential curl libusb-1.0-0-dev libczmq-dev libncurses-dev meson libsdl2-dev libelf-dev libcapstone-dev
 
-RUN git clone --depth 1 --branch V2.1.0 https://github.com/orbcode/orbuculum.git orbuculum_build && \
+RUN git clone --depth 1 --branch V2.2.0 https://github.com/orbcode/orbuculum.git orbuculum_build && \
 	cd orbuculum_build && meson setup --prefix=/usr build && \
 	meson compile -C build && \
 	DESTDIR=/orbuculum meson install -C build
 
-FROM mcr.microsoft.com/devcontainers/base:1.0.8-ubuntu-22.04
+FROM ubuntu:24.04 AS pyocd_pack_build
 
-RUN echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main" >> /etc/apt/sources.list && \
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
+	apt-get -y install python3-pip zip unzip && \
+	pip install --break-system-packages pyocd==0.36.0
+
+RUN pyocd pack install stm32 nrf51
+
+RUN cd ~/.local/share/cmsis-pack-manager/ && \
+	for file in $(find . -iname "*.pack"); do zipinfo -1 $file | sed '/^.*\(flm\|pdsc\|svd\|dbgconf\|sdf\)/Id' | xargs zip -d $file; done
+
+FROM mcr.microsoft.com/devcontainers/base:1.2.6-ubuntu-24.04
+
+RUN echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu noble main" >> /etc/apt/sources.list && \
 	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776
 
-# Texane st-link (version 1.7.0 in repository)
+# Texane st-link (version 1.8.0 in repository)
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
 	apt-get -y install \
 	make \
 	bear \
 	picocom \
+	microcom \
 	xz-utils \
 	python3-pip \
 	telnet \
-	libncursesw5 \
 	python3.8 \
+	libpython3.8 \
 	libusb-1.0 \
 	libczmq4 \
+	libelf1 \
+	libsdl2-2.0-0 \
+	libcapstone4 \
 	libncurses6 \
 	libglib2.0-0 \
 	cmake \
 	stlink-tools \
+	gdb-multiarch \
 	&& rm -rf /var/lib/apt/lists/*
 
 # ARM GCC Compiler
-RUN curl -sL "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz" | tar -xJf - -C /usr/local --strip-components=1
+RUN curl -sL "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz" | tar -xJf - -C /usr/local --strip-components=1
 
-# OpenOCD (version 0.12.0-1)
+# OpenOCD (version 0.12.0-6)
 RUN mkdir /opt/openocd && \
-	curl -sL "https://github.com/xpack-dev-tools/openocd-xpack/releases/download/v0.12.0-1/xpack-openocd-0.12.0-1-linux-x64.tar.gz" | tar -xzf - -C /opt/openocd --strip-components=1 && \
+	curl -sL "https://github.com/xpack-dev-tools/openocd-xpack/releases/download/v0.12.0-6/xpack-openocd-0.12.0-6-linux-x64.tar.gz" | tar -xzf - -C /opt/openocd --strip-components=1 && \
 	ln -s /opt/openocd/bin/openocd /usr/local/bin/openocd
 
 # STM32CubeProgrammer (version 2.13.0)
 ADD stm32cubeprogrammer /opt/stm32cubeprogrammer
 RUN ln -s /opt/stm32cubeprogrammer/bin/STM32_Programmer_CLI /usr/local/bin/STM32_Programmer_CLI
 
 # PyOCD
-RUN pip install pyocd==0.36.0
-
-USER vscode
-
-RUN pyocd pack install stm32 nrf51 && \
-	cd ~/.local/share/cmsis-pack-manager/ && \
-	for file in $(find . -iname "*.pack"); do zipinfo -1 $file | sed '/^.*\(flm\|pdsc\|svd\|dbgconf\|sdf\)/Id' | xargs zip -d $file; done
-
-USER root
+RUN pip install --break-system-packages pyocd==0.36.0
 
 # clangd (version 17.0.3)
 RUN mkdir /tmp/clangd && \
-	curl -sL -o /tmp/clangd/clangd.zip "https://github.com/clangd/clangd/releases/download/17.0.3/clangd-linux-17.0.3.zip" && \
+	curl -sL -o /tmp/clangd/clangd.zip "https://github.com/clangd/clangd/releases/download/20.1.0/clangd-linux-20.1.0.zip" && \
 	unzip /tmp/clangd/clangd.zip -d /tmp/clangd && \
-	cp -r /tmp/clangd/clangd_17.0.3/* /usr/local/ && \
+	cp -r /tmp/clangd/clangd_20.1.0/* /usr/local/ && \
 	rm /tmp/clangd -rf
 
 # Clangd default configuration
 COPY --chown=vscode:vscode config.yaml /home/vscode/.config/clangd/config.yaml
 
 # Orbuculum
 COPY --from=orbuculum_build	/orbuculum /
+
+# Pyocd packs
+COPY --from=pyocd_pack_build --chown=vscode:vscode /root/.local/share/cmsis-pack-manager/ /home/vscode/.local/share/cmsis-pack-manager/

barearm/test.sh

@@ -30,8 +30,8 @@ assert_raises "orbcat --version" 255
 assert_raises "orbtop --version" 234
 
 # Test gdb
-assert "arm-none-eabi-gdb -batch -ex 'python print(\"OK\")'" "OK"
+assert "arm-none-eabi-gdb-py -batch -ex 'python print(\"OK\")'" "OK"
 # Test all pyocd packs have been downloaded
 assert "find ~/.local/share/cmsis-pack-manager/ -type d -empty | wc -l" "0"
 
-assert_end barearm
+assert_end barearm