Skip to content

Commit 05d7818

Browse files
committed
bump: build OpenCV 4.11
1 parent f7f053a commit 05d7818

File tree

5 files changed

+12
-31
lines changed

5 files changed

+12
-31
lines changed

.github/workflows/docker-builds.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,16 @@ jobs:
1919
matrix:
2020
ubuntu_version: ["20.04"]
2121
python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
22-
opencv_version: ["4.10.0"]
22+
opencv_version: ["4.11.0"]
2323
device: ["cpu", "gpu"]
2424
cuda_version: ["11.8.0"]
2525
include:
26-
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
27-
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
28-
# fixme: python 3.12 install fails due to wring public keys to deadsnakes
29-
# - { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
30-
- {
31-
ubuntu_version: "22.04",
32-
python_version: "3.10",
33-
opencv_version: "4.10.0",
34-
device: "gpu",
35-
cuda_version: "12.5.0",
36-
}
37-
- {
38-
ubuntu_version: "22.04",
39-
python_version: "3.11",
40-
opencv_version: "4.10.0",
41-
device: "gpu",
42-
cuda_version: "12.5.0",
43-
}
44-
- {
45-
ubuntu_version: "22.04",
46-
python_version: "3.12",
47-
opencv_version: "4.10.0",
48-
device: "gpu",
49-
cuda_version: "12.5.0",
50-
}
26+
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.11.0", device: "cpu" }
27+
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.11.0", device: "cpu" }
28+
- { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.11.0", device: "cpu" }
29+
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.5.0" }
30+
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.5.0" }
31+
- { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.5.0" }
5132
steps:
5233
- name: Checkout
5334
uses: actions/checkout@v4

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ repos:
4141
- id: prettier
4242
files: \.(json|yml|yaml|toml)
4343
# https://prettier.io/docs/en/options.html#print-width
44-
args: ["--print-width=120"]
44+
args: ["--print-width=140"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Repository for clean Dockerfile containing [FFmpeg](https://www.ffmpeg.org/), [O
44

55
## Tags
66

7-
- `:cpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg
8-
- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg with CUDA 11.4 support
7+
- `:cpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.11.x, FFmpeg
8+
- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.11.x, FFmpeg with CUDA 11.4 support
99

1010
## Build
1111

cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM ubuntu:${UBUNTU_VERSION}
88
LABEL maintainer="https://github.com/Borda"
99

1010
ARG PYTHON_VERSION="3.9"
11-
ARG OPENCV_VERSION="4.10.0"
11+
ARG OPENCV_VERSION="4.11.0"
1212

1313
# Needed for string substitution
1414
SHELL ["/bin/bash", "-c"]

gpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
1313
LABEL maintainer="https://github.com/Borda"
1414

1515
ARG PYTHON_VERSION="3.9"
16-
ARG OPENCV_VERSION="4.10.0"
16+
ARG OPENCV_VERSION="4.11.0"
1717

1818
# Needed for string substitution
1919
SHELL ["/bin/bash", "-c"]

0 commit comments

Comments
 (0)