From 6f0e7101543bf27d44004a6790ef99686f8db3ea Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 22 Oct 2026 11:45:10 +0000 Subject: ide: preinstall correct version of Catch2 --- .devcontainer/x86-64/Containerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to '.devcontainer/x86-64') diff --git a/.devcontainer/x86-64/Containerfile b/.devcontainer/x86-64/Containerfile index fe133dc3..cf862de4 100644 --- a/.devcontainer/x86-64/Containerfile +++ b/.devcontainer/x86-64/Containerfile @@ -2,9 +2,11 @@ FROM registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:16.2.0-1-py3.14 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --yes --no-install-recommends \ acpica-tools \ + ca-certificates \ clangd-22 \ clang-tidy-22 \ cmake \ + curl \ g++-16 \ gcc-16 \ gdb \ @@ -12,7 +14,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --yes --no- git-lfs \ grub2-common \ grub-pc \ - libcatch2-dev \ locales \ make \ mtools \ @@ -37,3 +38,11 @@ RUN update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-16 100 && \ update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-16 100 && \ update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-22 100 && \ update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-22 100 + +RUN curl -LO https://github.com/catchorg/Catch2/archive/refs/tags/v3.15.3.tar.gz && \ + tar xf v3.15.3.tar.gz && \ + cd Catch2-3.15.3 && \ + cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF && \ + cmake --build build --target install --parallel && \ + cd .. && \ + rm -rf Catch2-3.15.3 v3.15.3.tar.gz -- cgit v1.2.3