From c2dd095eae898e8e5759c3bb3ad5baf2ad927edf Mon Sep 17 00:00:00 2001 From: David Cozens Date: Tue, 12 May 2026 21:03:11 +0100 Subject: [PATCH] chore: bump container image to sha-bbc958b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Picks up the FatFs R0.16 swap from CppUTestFreertosDocker#1 — Plus-FAT is gone from the image, FatFs is now at /opt/fatfs with FATFS_PATH set. Prerequisite for SolidSyslog #270 (S08.05) which targets FatFs as its embedded persistent-store backend. - .devcontainer/docker-compose.yml — freertos-host, freertos-target - .github/workflows/ci.yml — build-freertos-host-tdd, build-freertos-target - ci/docker-compose.bdd.yml — behave-freertos - docs/containers.md — both image rows; Plus-FAT -> FatFs in env-vars text - Platform/FreeRtos/CMakeLists.txt — drop Plus-FAT mention from header-configured rationale (Plus-FAT no longer in image) Co-Authored-By: Claude Opus 4.7 (1M context) --- .devcontainer/docker-compose.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- Platform/FreeRtos/CMakeLists.txt | 10 +++++----- ci/docker-compose.bdd.yml | 2 +- docs/containers.md | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 71898234..6c8632e3 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -102,7 +102,7 @@ services: command: sleep infinity freertos-host: - image: ghcr.io/davidcozens/cpputest-freertos:sha-10a14ae + image: ghcr.io/davidcozens/cpputest-freertos:sha-bbc958b volumes: - ..:/workspaces/SolidSyslog:cached - ${SSH_AUTH_SOCK:-/dev/null}:/ssh-agent @@ -153,7 +153,7 @@ services: - syslog-ng freertos-target: - image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-10a14ae + image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-bbc958b volumes: - ..:/workspaces/SolidSyslog:cached - syslog-ng-ctl-freertos:/var/lib/syslog-ng diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5e1be98..88926129 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -724,7 +724,7 @@ jobs: contents: read checks: write container: - image: ghcr.io/davidcozens/cpputest-freertos:sha-10a14ae + image: ghcr.io/davidcozens/cpputest-freertos:sha-bbc958b options: --user root env: GIT_CONFIG_COUNT: 1 @@ -768,7 +768,7 @@ jobs: permissions: contents: read container: - image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-10a14ae + image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-bbc958b options: --user root env: GIT_CONFIG_COUNT: 1 diff --git a/Platform/FreeRtos/CMakeLists.txt b/Platform/FreeRtos/CMakeLists.txt index d58dfcd7..e664eb72 100644 --- a/Platform/FreeRtos/CMakeLists.txt +++ b/Platform/FreeRtos/CMakeLists.txt @@ -1,10 +1,10 @@ # FreeRTOS adapter pack — shipped as sources, not a precompiled library. # -# FreeRTOS, FreeRTOS-Plus-FAT, and Mbed TLS are header-configured: the -# integrator's FreeRTOSConfig.h / ffconf.h / mbedtls_config.h flows through -# upstream headers and changes the size/layout of TCBs, semaphores, file -# handles, and SSL contexts. Compiling our adapters once into libSolidSyslog.a -# would silently break consumers that use a different config. +# FreeRTOS and Mbed TLS are header-configured: the integrator's +# FreeRTOSConfig.h / mbedtls_config.h flows through upstream headers and +# changes the size/layout of TCBs, semaphores, and SSL contexts. Compiling +# our adapters once into libSolidSyslog.a would silently break consumers +# that use a different config. # # Instead, this is an INTERFACE library — each consumer (Example/FreeRtos/*, # Tests/FreeRtos/*Test, downstream integrator apps) recompiles the adapter diff --git a/ci/docker-compose.bdd.yml b/ci/docker-compose.bdd.yml index b2b23a51..44bf9275 100644 --- a/ci/docker-compose.bdd.yml +++ b/ci/docker-compose.bdd.yml @@ -87,7 +87,7 @@ services: behave-freertos: # Cross image carries qemu-system-arm + python3 + behave. - image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-10a14ae + image: ghcr.io/davidcozens/cpputest-freertos-cross:sha-bbc958b user: "0" volumes: - ..:/workspaces/SolidSyslog diff --git a/docs/containers.md b/docs/containers.md index 4d6b4c57..d28cf975 100644 --- a/docs/containers.md +++ b/docs/containers.md @@ -6,8 +6,8 @@ |---|---|---| | `ghcr.io/davidcozens/cpputest` | `sha-18f19e1` | devcontainer (`gcc` service), most CI jobs | | `ghcr.io/davidcozens/cpputest-clang` | `sha-7eac3ab` | `clang` compose service, `build-linux-clang` CI job, `analyze-iwyu` CI job | -| `ghcr.io/davidcozens/cpputest-freertos` | `sha-10a14ae` | `freertos-host` compose service, `build-freertos-host-tdd` CI job — adds FreeRTOS-Kernel / Plus-TCP / Plus-FAT / Mbed TLS sources for host-TDD of FreeRTOS adapters against fakes | -| `ghcr.io/davidcozens/cpputest-freertos-cross` | `sha-10a14ae` | `freertos-target` compose service, `build-freertos-target` CI job, `behave-freertos` BDD service, `bdd-freertos-qemu` CI job — adds `gcc-arm-none-eabi`, `libnewlib-arm-none-eabi`, `gdb-multiarch` (aliased as `arm-none-eabi-gdb`), `qemu-system-arm`, `python3` + `behave` for cross builds, on-QEMU runs, and BDD scenarios driving a QEMU target | +| `ghcr.io/davidcozens/cpputest-freertos` | `sha-bbc958b` | `freertos-host` compose service, `build-freertos-host-tdd` CI job — adds FreeRTOS-Kernel / Plus-TCP / FatFs / Mbed TLS sources for host-TDD of FreeRTOS adapters against fakes | +| `ghcr.io/davidcozens/cpputest-freertos-cross` | `sha-bbc958b` | `freertos-target` compose service, `build-freertos-target` CI job, `behave-freertos` BDD service, `bdd-freertos-qemu` CI job — adds `gcc-arm-none-eabi`, `libnewlib-arm-none-eabi`, `gdb-multiarch` (aliased as `arm-none-eabi-gdb`), `qemu-system-arm`, `python3` + `behave` for cross builds, on-QEMU runs, and BDD scenarios driving a QEMU target | | `balabit/syslog-ng` | `4.8.2` | `syslog-ng-linux` and `syslog-ng-freertos` services — BDD test oracles, one per target pair. Pinned to the 4.8 LTS line; 4.11.0 (`latest` as of 2026-02-24) regressed by aborting on `STATS` over the control socket, which crashed the oracle and cascaded to the dev-container network when `freertos-target` shares the namespace. | | `ghcr.io/davidcozens/behave` | `sha-3faff14` | `behave-linux` service — Debian trixie + Python 3.12 + Behave for Linux BDD scenarios. The FreeRTOS BDD runner uses the `cpputest-freertos-cross` image instead (which carries QEMU + Behave). |