From 07ea40a09cf47861adac0f668e314ac2123dea87 Mon Sep 17 00:00:00 2001 From: Jirka B Date: Wed, 23 Jul 2025 13:19:08 +0200 Subject: [PATCH] bump: build OpenCV `4.12` --- .github/workflows/docker-builds.yml | 18 +++++++++--------- README.md | 4 ++-- cpu/Dockerfile | 2 +- gpu/Dockerfile | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index da43ba6..2f948fd 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -19,18 +19,18 @@ jobs: matrix: ubuntu_version: ["22.04"] python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] - opencv_version: ["4.11.0"] + opencv_version: ["4.12.0"] device: ["cpu", "gpu"] cuda_version: ["12.4.1"] include: - - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.11.0", device: "cpu" } - - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.11.0", device: "cpu" } - #- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.11.0", device: "cpu" } - - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.11.0", device: "cpu" } - - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" } - - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" } - #- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" } - - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" } + - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.12.0", device: "cpu" } + - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.12.0", device: "cpu" } + #- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.12.0", device: "cpu" } + - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.12.0", device: "cpu" } + - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.12.0", device: "gpu", cuda_version: "12.8.0" } + - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.12.0", device: "gpu", cuda_version: "12.8.0" } + #- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.12.0", device: "gpu", cuda_version: "12.8.0" } + - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.12.0", device: "gpu", cuda_version: "12.8.0" } steps: - name: Checkout uses: actions/checkout@v4 diff --git a/README.md b/README.md index 9ce36ab..d6dd08e 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Repository for clean Dockerfile containing [FFmpeg](https://www.ffmpeg.org/), [O ## Tags -- `:cpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.11.x, FFmpeg -- `:gpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.11.x, FFmpeg with CUDA 12.x support +- `:cpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.12.x, FFmpeg +- `:gpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.12.x, FFmpeg with CUDA 12.x support ## Build diff --git a/cpu/Dockerfile b/cpu/Dockerfile index b85c212..bc447a3 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:${UBUNTU_VERSION} LABEL maintainer="https://github.com/Borda" ARG PYTHON_VERSION="3.9" -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" # Needed for string substitution SHELL ["/bin/bash", "-c"] diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 0141536..7bcb558 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -13,7 +13,7 @@ FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION} LABEL maintainer="https://github.com/Borda" ARG PYTHON_VERSION="3.9" -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" # Needed for string substitution SHELL ["/bin/bash", "-c"]