Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ jobs:
matrix:
ubuntu_version: ["22.04"]
python_version: ["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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down