From ef64ca2e13c73934d356fe68b4b06073ccb25f68 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Tue, 11 Aug 2026 20:38:21 +0200 Subject: [PATCH] Build the report image on the same base as OpenModelica The image the report stages run in was still built on build-deps:v1.16.3, which is the dependency image of OpenModelica 1.16. It now uses ubuntu-22.04, the one the OpenModelica repository builds against in .CI/common.groovy and every cmake Jenkinsfile, so the reports run on the same Ubuntu and the same Python as everything else. That also gets psycopg2-binary a wheel to install rather than a source build, which needs pg_config from libpq-dev; the results database needs psycopg2 since #296. Two things the change makes explicit rather than assume of the base image: apt is told -y, because an image that does not assume it turns the build into a prompt that never gets answered, and python3-pip is installed, because the line after it needs pip and the base may not carry it. --- Generated by Claude Code. --- .CI/build-dep/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.CI/build-dep/Dockerfile b/.CI/build-dep/Dockerfile index c0f8abe..5f329b7 100644 --- a/.CI/build-dep/Dockerfile +++ b/.CI/build-dep/Dockerfile @@ -1,4 +1,7 @@ -FROM docker.openmodelica.org/build-deps:v1.16.3 +# The image the OpenModelica repository builds against, see its .CI/common.groovy +FROM docker.openmodelica.org/build-deps:ubuntu-22.04 -RUN apt-get update && apt-get install libxml2 libxslt1.1 libxml2-dev libxslt1-dev +# -y because a base image that does not assume it turns the build into a prompt, +# and python3-pip because the line below needs it and the base may not carry it. +RUN apt-get update && apt-get install -y libxml2 libxslt1.1 libxml2-dev libxslt1-dev python3-pip RUN pip3 install matplotlib FMPy psycopg2-binary