From baa63421f141a03b6f352e8e4283c03761d6021f Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Sun, 15 Sep 2024 21:51:17 +0200
Subject: [PATCH] PIPELINE: Update to Debian 12 aka bookworm

---
 .docker/Dockerfile | 15 +++++++++------
 .gitlab-ci.yml     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 320a6e2..da36ef0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,23 +1,26 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN apt-get update
 RUN apt-get install -y cmake
 RUN apt-get install -y lcov
 RUN apt-get install -y doxygen graphviz
-RUN apt-get install -y clang-format-11 clang-tidy-11
-RUN apt-get install -y python3-pip
+RUN apt-get install -y clang-format clang-tidy
+RUN apt-get install -y python3-pip python3-venv
 RUN apt-get install -y git
 RUN apt-get install -y curl zip unzip tar
+RUN apt-get install -y perl
 
 
-RUN apt-get install -y openjdk-11-jdk-headless
+RUN apt-get install -y  openjdk-17-jdk-headless
 
 
 WORKDIR /
+RUN python3 -m venv ./venv
+RUN . ./venv/bin/activate
 COPY doc/requirements.txt doc-requirements.txt
-RUN pip3 install -r doc-requirements.txt
+RUN ./venv/bin/pip install -r doc-requirements.txt
 COPY requirements.txt build-requirements.txt
-RUN pip3 install -r build-requirements.txt
+RUN ./venv/bin/pip install -r build-requirements.txt
 
 COPY . /libcaosdb/
 WORKDIR /libcaosdb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 244fc7e..c703a46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ code_style:
   tags: [ docker ]
   stage: test
   script:
-    - clang-format-11 --dry-run --verbose --Werror $(find test/ src/ include/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
+    - clang-format --dry-run --verbose --Werror $(find test/ src/ include/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
   allow_failure: true
 
 
-- 
GitLab