Skip to content

Commit 0ec125d

Browse files
authored
Merge pull request #862 from asmorkalov/as/deps_update
Build environment update on Linux.
2 parents b534ea2 + e26e6e4 commit 0ec125d

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/build_wheels_linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
MB_ML_VER: 2014
4242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4343
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
139139
NP_TEST_DEP: numpy==1.19.4
140140
TRAVIS_BUILD_DIR: ${{ github.workspace }}
141141
CONFIG_PATH: travis_config.sh
142-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
142+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
143143
USE_CCACHE: 1
144144
UNICODE_WIDTH: 32
145145
SDIST: ${{ matrix.build_sdist || 0 }}

.github/workflows/build_wheels_linux_arm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
MB_ML_VER: 2014
4343
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4444
CONFIG_PATH: travis_config.sh
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230117
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230628
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}

docker/manylinux2014/Dockerfile_aarch64

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20230117
1+
# Version: 20230628
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.2
8-
ARG FREETYPE_VERSION=2.12.1
9-
ARG LIBPNG_VERSION=1.6.37
7+
ARG FFMPEG_VERSION=5.1.3
8+
ARG FREETYPE_VERSION=2.13.1
9+
ARG LIBPNG_VERSION=1.6.40
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1s
11+
ARG OPENSSL_VERSION=1_1_1u
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414

docker/manylinux2014/Dockerfile_x86_64

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20230117
1+
# Version: 20230628
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.2
8-
ARG FREETYPE_VERSION=2.12.1
9-
ARG LIBPNG_VERSION=1.6.37
7+
ARG FFMPEG_VERSION=5.1.3
8+
ARG FREETYPE_VERSION=2.13.1
9+
ARG LIBPNG_VERSION=1.6.40
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1s
11+
ARG OPENSSL_VERSION=1_1_1u
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414

0 commit comments

Comments
 (0)