Merge pull request #1282 from NickeZ/nickez/create-containerversion

ci: Move the current container version to .containerversion

Author: NickeZ

.ci/run-container-ci

@@ -25,7 +25,9 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:41
+CONTAINER_REPO=shiftcrypto/firmware_v2
+CONTAINER_VERSION=$(cat .containerversion)
+CONTAINER=$CONTAINER_REPO:${CONTAINER_VERSION}
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

.containerversion

@@ -0,0 +1 @@
+41

BUILD.md

@@ -39,6 +39,9 @@ make dockerdev
 The docker container will not allow you to access the hosts USB devices by default which means that
 it is necessary to flash the device in a terminal not running in docker.
 
+> [!NOTE]
+> Current development container is defined in the file `.containerversion`
+
 ### Install development environment on macOS
 
 Make sure you have [Homebrew](https://brew.sh) installed.

Makefile

@@ -129,7 +129,9 @@ jlink-flash-factory-setup: | build
 jlink-flash-firmware-semihosting: | build-semihosting
 	JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-semihosting/scripts/firmware.jlink
 dockerinit:
-	./scripts/container.sh build --pull --platform linux/amd64 --force-rm --no-cache -t shiftcrypto/firmware_v2 .
+	./scripts/container.sh build --pull --platform linux/amd64 --force-rm --no-cache -t shiftcrypto/firmware_v2:$(shell cat .containerversion) .
+dockerpull:
+	./scripts/container.sh pull shiftcrypto/firmware_v2:$(shell cat .containerversion)
 dockerdev:
 	./scripts/dockerenv.sh
 dockerrel:

scripts/dockerenv.sh

@@ -33,7 +33,7 @@ else
 fi
 
 CONTAINER_IMAGE=shiftcrypto/firmware_v2
-CONTAINER_VERSION=${CONTAINER_VERSION:-latest}
+CONTAINER_VERSION=${CONTAINER_VERSION:-$(cat .containerversion)}
 PROJECT_NAME="$(basename "$(realpath "$DIR/..")")"
 CONTAINER_NAME="$PROJECT_NAME-$CONTAINER_NAME_SUFFIX"