Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1051e53

Browse filesBrowse files
asmorkalovasmorkalov
authored
Merge pull request opencv#905 from asmorkalov/as/docker_update_python3.12
Docker images update for Python 3.12 and security fixes
2 parents ca13925 + 4493945 commit 1051e53
Copy full SHA for 1051e53

File tree

Expand file treeCollapse file tree

4 files changed

+12
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+12
-11
lines changed
Open diff view settings
Collapse file

‎.github/workflows/build_wheels_linux.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux.yml
+2-2Lines changed: 2 additions & 2 deletions
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:20230628
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
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:20230628
142+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
143143
USE_CCACHE: 1
144144
UNICODE_WIDTH: 32
145145
SDIST: ${{ matrix.build_sdist || 0 }}
Collapse file

‎.github/workflows/build_wheels_linux_arm.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux_arm.yml
+1-1Lines changed: 1 addition & 1 deletion
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:20230628
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231006
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}
Collapse file

‎docker/manylinux2014/Dockerfile_aarch64‎

Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_aarch64
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20230628
1+
# Version: 20231006
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
77
ARG FFMPEG_VERSION=5.1.3
8-
ARG FREETYPE_VERSION=2.13.1
8+
ARG FREETYPE_VERSION=2.13.2
99
ARG LIBPNG_VERSION=1.6.40
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1u
11+
ARG OPENSSL_VERSION=1_1_1w
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414

@@ -33,9 +33,10 @@ RUN mkdir ~/libpng_sources && \
3333
cd .. && \
3434
rm -rf ~/libpng_sources
3535

36+
# looks like download.savannah.gnu.org suffers from https://savannah.gnu.org/bugs/?48150 in Manylinux 2014 env on aarch64
3637
RUN mkdir ~/freetype_sources && \
3738
cd ~/freetype_sources && \
38-
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
39+
curl -O -L https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
3940
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
4041
cd freetype-${FREETYPE_VERSION} && \
4142
./configure --prefix="/ffmpeg_build" --enable-freetype-config && \
@@ -44,7 +45,7 @@ RUN mkdir ~/freetype_sources && \
4445
cd .. && \
4546
rm -rf ~/freetype_sources
4647

47-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
48+
RUN curl -C - -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
4849
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
4950
cd qt-everywhere-src-${QT_VERSION} && \
5051
export MAKEFLAGS=-j$(nproc) && \
Collapse file

‎docker/manylinux2014/Dockerfile_x86_64‎

Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_x86_64
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20230628
1+
# Version: 20231006
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
77
ARG FFMPEG_VERSION=5.1.3
8-
ARG FREETYPE_VERSION=2.13.1
8+
ARG FREETYPE_VERSION=2.13.2
99
ARG LIBPNG_VERSION=1.6.40
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1u
11+
ARG OPENSSL_VERSION=1_1_1w
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.