From 5623f3ad386dadb748929633cc0e25f0f122373a Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <alexander.smorkalov@opencv.ai> Date: Fri, 7 Feb 2025 11:11:39 +0300 Subject: [PATCH 1/2] Added OpenEXR to docker to cover the branch in CI. --- ubuntu-github-actions--20.04/Dockerfile | 3 ++- ubuntu-github-actions--24.04/Dockerfile | 5 +++-- ubuntu-github-actions-openvino--20.04/Dockerfile | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ubuntu-github-actions--20.04/Dockerfile b/ubuntu-github-actions--20.04/Dockerfile index 0e4f867..90c984c 100644 --- a/ubuntu-github-actions--20.04/Dockerfile +++ b/ubuntu-github-actions--20.04/Dockerfile @@ -1,4 +1,4 @@ -# Version: 20230413 +# Version: 20250207 # Image name: quay.io/opencv-ci/opencv-ubuntu-20.04 FROM ubuntu:20.04 @@ -35,6 +35,7 @@ RUN \ libtiff5-dev \ libopenjp2-7-dev \ libraw-dev \ + libopenexr-dev \ libgtk-3-dev \ libavcodec-dev \ libavformat-dev \ diff --git a/ubuntu-github-actions--24.04/Dockerfile b/ubuntu-github-actions--24.04/Dockerfile index 37e7613..ac433d7 100644 --- a/ubuntu-github-actions--24.04/Dockerfile +++ b/ubuntu-github-actions--24.04/Dockerfile @@ -1,4 +1,4 @@ -# Version: 20241031 +# Version: 20250207 # Image name: quay.io/opencv-ci/opencv-ubuntu-24.04 FROM ubuntu:24.04 @@ -32,7 +32,8 @@ RUN \ libopenjp2-7-dev \ libavif-dev \ libjxl-dev \ - libgtk-4-dev \ + libopenexr-dev \ + libgtk-3-dev \ libavcodec-dev \ libavformat-dev \ libswscale-dev \ diff --git a/ubuntu-github-actions-openvino--20.04/Dockerfile b/ubuntu-github-actions-openvino--20.04/Dockerfile index dabce24..52ac5c4 100644 --- a/ubuntu-github-actions-openvino--20.04/Dockerfile +++ b/ubuntu-github-actions-openvino--20.04/Dockerfile @@ -1,4 +1,4 @@ -# Version: 20230724 +# Version: 20250207 # Image name: quay.io/opencv-ci/opencv-ubuntu-20.04-openvino FROM openvino/ubuntu20_dev:2024.0.0 @@ -32,6 +32,7 @@ RUN \ libpng-dev \ libtiff5-dev \ libopenjp2-7-dev \ + libopenexr-dev \ libgtk-3-dev \ libavcodec-dev \ libavformat-dev \ From e5191269808df53ae930eeac2a6c9cb79801c4b7 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin <maksim.shabunin@gmail.com> Date: Thu, 13 Feb 2025 15:54:14 +0300 Subject: [PATCH 2/2] Fix python packages in ubuntu 20.04 container --- ubuntu-github-actions--20.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-github-actions--20.04/Dockerfile b/ubuntu-github-actions--20.04/Dockerfile index 90c984c..700b7e7 100644 --- a/ubuntu-github-actions--20.04/Dockerfile +++ b/ubuntu-github-actions--20.04/Dockerfile @@ -68,7 +68,7 @@ RUN \ pkg-config \ && \ apt-get clean && python3 -m pip install --upgrade pip && \ - pip install requests pylint==2.4.4 reportlab svglib && pip cache purge + pip install --break-system-packages requests pylint==2.4.4 reportlab svglib pycairo rlPyCairo && pip cache purge RUN \ apt-get update && \