From 7330299073d30c00e5e2f1a6d93e99df19acca66 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 14 Apr 2023 10:55:26 +0300 Subject: [PATCH] Docker images update to include svg rendering libs for Python. --- .github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml | 2 +- .github/workflows/OCV-Contrib-PR-3.4-U20.yaml | 2 +- .github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml | 2 +- .github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml | 2 +- .github/workflows/OCV-Contrib-PR-4.x-U20.yaml | 2 +- .github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml | 2 +- .github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml | 2 +- .github/workflows/OCV-Contrib-PR-5.x-U20.yaml | 2 +- .github/workflows/OCV-PR-3.4-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-3.4-U20.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-U20-Cuda.yaml | 2 +- .github/workflows/OCV-PR-4.x-U20.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-U20-Cuda.yaml | 2 +- .github/workflows/OCV-PR-5.x-U20.yaml | 4 ++-- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml index 1ff2ddc5..aab09449 100644 --- a/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml b/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml index 1b4846ff..9f7623db 100644 --- a/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml +++ b/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml index e71def86..f571d67c 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml b/.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml index e443e87a..dad1fce3 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml @@ -31,7 +31,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 options: --gpus all -m 8G volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache diff --git a/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml b/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml index a9082727..5b1c28b5 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml index 9e9c9655..d9c38385 100644 --- a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml b/.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml index a29961e4..74ecde4c 100644 --- a/.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml @@ -31,7 +31,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 options: --gpus all -m 8G volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache diff --git a/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml b/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml index fdbf2c9f..2ed31031 100644 --- a/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml +++ b/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-3.4-ARM64.yaml b/.github/workflows/OCV-PR-3.4-ARM64.yaml index d748a3a3..62a90b6a 100644 --- a/.github/workflows/OCV-PR-3.4-ARM64.yaml +++ b/.github/workflows/OCV-PR-3.4-ARM64.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -255,7 +255,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-3.4-U20.yaml b/.github/workflows/OCV-PR-3.4-U20.yaml index ccab7ad4..17f2a81b 100644 --- a/.github/workflows/OCV-PR-3.4-U20.yaml +++ b/.github/workflows/OCV-PR-3.4-U20.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -260,7 +260,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml index f7c37b82..ce918469 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml @@ -32,7 +32,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -182,7 +182,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml index 5c5cfc74..b7c1bce1 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -244,7 +244,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-4.x-U20-Cuda.yaml b/.github/workflows/OCV-PR-4.x-U20-Cuda.yaml index 611387ef..5649cb7f 100644 --- a/.github/workflows/OCV-PR-4.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-PR-4.x-U20-Cuda.yaml @@ -32,7 +32,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 options: --gpus all -m 8G volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache diff --git a/.github/workflows/OCV-PR-4.x-U20.yaml b/.github/workflows/OCV-PR-4.x-U20.yaml index fe9743be..7c8745aa 100644 --- a/.github/workflows/OCV-PR-4.x-U20.yaml +++ b/.github/workflows/OCV-PR-4.x-U20.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -257,7 +257,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml index 65c57052..66079819 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml @@ -32,7 +32,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -190,7 +190,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index ab23084e..19326625 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -260,7 +260,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml index e6c32b9b..f8958715 100644 --- a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml @@ -32,7 +32,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 options: --gpus all -m 8G volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache diff --git a/.github/workflows/OCV-PR-5.x-U20.yaml b/.github/workflows/OCV-PR-5.x-U20.yaml index 07af0f4e..d9bea079 100644 --- a/.github/workflows/OCV-PR-5.x-U20.yaml +++ b/.github/workflows/OCV-PR-5.x-U20.yaml @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -271,7 +271,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410 + image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache