From f4c9a0c2e8e91e0a18b14a27834d6ff62e6c3232 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
Date: Mon, 5 May 2025 12:42:34 +0300
Subject: [PATCH] Docker update to cover OpenEXR branch.

---
 .github/workflows/OCV-PR-Linux.yaml | 6 +++---
 docker/ubuntu/Dockerfile-20         | 5 +++--
 docker/ubuntu/Dockerfile-24         | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/OCV-PR-Linux.yaml b/.github/workflows/OCV-PR-Linux.yaml
index 213800bc..43e206aa 100644
--- a/.github/workflows/OCV-PR-Linux.yaml
+++ b/.github/workflows/OCV-PR-Linux.yaml
@@ -61,13 +61,13 @@ jobs:
         branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}}
         include:
           - version: '24.04'
-            image: '24.04:20250329'
+            image: '24.04:20250505'
             jpegxl: true
             avif: true
             avx2: true
           # TODO: enable later
           # - version: '24.04_asan'
-          #   image: '24.04:20250329'
+          #   image: '24.04:20250505'
           #   asan: true
           #   jpegxl: true
           #   avif: true
@@ -76,7 +76,7 @@ jobs:
             avif: true
             plugins: true
           - version: '20.04'
-            image: '20.04:20230413'
+            image: '20.04:20250505'
             limited_api: true
 
     defaults:
diff --git a/docker/ubuntu/Dockerfile-20 b/docker/ubuntu/Dockerfile-20
index 0e4f8671..cd03ce61 100644
--- a/docker/ubuntu/Dockerfile-20
+++ b/docker/ubuntu/Dockerfile-20
@@ -1,4 +1,4 @@
-# Version: 20230413
+# Version: 20250505
 # 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 \
@@ -67,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 requests pylint==2.4.4 reportlab svglib pycairo rlPyCairo && pip cache purge
 
 RUN \
   apt-get update && \
diff --git a/docker/ubuntu/Dockerfile-24 b/docker/ubuntu/Dockerfile-24
index 6c721466..b720194b 100644
--- a/docker/ubuntu/Dockerfile-24
+++ b/docker/ubuntu/Dockerfile-24
@@ -1,4 +1,4 @@
-# Version: 20250329
+# Version: 20250505
 # Image name: quay.io/opencv-ci/opencv-ubuntu-24.04
 
 FROM ubuntu:24.04
@@ -40,6 +40,7 @@ RUN \
     libopenjp2-7-dev \
     libavif-dev \
     libjxl-dev \
+    libopenexr-dev \
     libgtk-3-dev \
     libgtk-4-dev \
     libavcodec-dev \