Merge pull request #862 from asmorkalov/as/deps_update

Build environment update on Linux.
opencv · Jun 29, 2023 · 0ec125d · 0ec125d
2 parents b534ea2 + e26e6e4
commit 0ec125d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}

diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230628
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}

diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,14 +1,14 @@
-# Version: 20230117
+# Version: 20230628
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.2
-ARG FREETYPE_VERSION=2.12.1
-ARG LIBPNG_VERSION=1.6.37
+ARG FFMPEG_VERSION=5.1.3
+ARG FREETYPE_VERSION=2.13.1
+ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1u
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 

diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,14 +1,14 @@
-# Version: 20230117
+# Version: 20230628
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.2
-ARG FREETYPE_VERSION=2.12.1
-ARG LIBPNG_VERSION=1.6.37
+ARG FFMPEG_VERSION=5.1.3
+ARG FREETYPE_VERSION=2.13.1
+ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1u
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0