Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: build OpenCV 4.11 #52

Merged
merged 10 commits into from
Mar 26, 2025
Merged

bump: build OpenCV 4.11 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1fe4ee3
bump: build OpenCV `4.11`
Borda Jan 16, 2025
45e055d
Empty-Commit
Borda Feb 24, 2025
6b627bb
libgtk-3-dev
Borda Mar 19, 2025
15ff318
glut
Borda Mar 24, 2025
89bfc97
libglu1-mesa-de
Borda Mar 24, 2025
99c850b
-D WITH_OPENGL=OFF
Borda Mar 24, 2025
8ec6938
libqt5x11extras5-dev
Borda Mar 26, 2025
f871b6b
libgtk-3-dev
Borda Mar 26, 2025
c0ecacb
BUILD_opencv_highgui=OFF
Borda Mar 26, 2025
e2a3919
libwebpmux3 libwebpdemux2
Borda Mar 26, 2025
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
View file
Open in desktop
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.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
opencv_version: ["4.10.0"]
opencv_version: ["4.11.0"]
device: ["cpu", "gpu"]
cuda_version: ["12.4.1"]
include:
- { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
#- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.10.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
- { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
#- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
- { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
- { 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" }
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
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.10.x, FFmpeg
- `:gpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.10.x, FFmpeg with CUDA 12.x support
- `: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

## Build

Expand Down
14 changes: 10 additions & 4 deletions cpu/Dockerfile
View file
Open in desktop
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.10.0"
ARG OPENCV_VERSION="4.11.0"

# Needed for string substitution
SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -53,7 +53,8 @@ RUN \
apt-utils \
pkg-config \
checkinstall \
qtbase5-dev qt5-qmake \
qtbase5-dev \
qt5-qmake \
build-essential \
liblapack-dev \
libatlas-base-dev \
Expand All @@ -77,7 +78,10 @@ RUN \
zlib1g-dev \
libsm6 \
libxext6 \
libxrender1 && \
libxrender1 \
libwebpmux3 \
libwebpdemux2 \
&& \
pip install numpy && \
# Install OpenCV
wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -O opencv.zip --progress=bar:force:noscroll --no-check-certificate && \
Expand All @@ -104,6 +108,7 @@ RUN \
-D PYTHON${PYTHON_VERSION%%.*}_EXECUTABLE=$(which python${PYTHON_VERSION}) \
-D PYTHON_DEFAULT_EXECUTABLE=$(which python${PYTHON_VERSION}) \
-D BUILD_EXAMPLES=OFF \
-D BUILD_opencv_highgui=OFF \
-D WITH_IPP=OFF \
-D WITH_FFMPEG=ON \
-D WITH_GSTREAMER=ON \
Expand Down Expand Up @@ -146,7 +151,8 @@ RUN \
libglew-dev \
libpostproc-dev \
libeigen3-dev \
zlib1g-dev && \
zlib1g-dev \
&& \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /opencv /opencv_contrib /var/lib/apt/lists/*
Expand Down
8 changes: 6 additions & 2 deletions gpu/Dockerfile
View file
Open in desktop
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.10.0"
ARG OPENCV_VERSION="4.11.0"

# Needed for string substitution
SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -64,7 +64,8 @@ RUN \
apt-utils \
pkg-config \
checkinstall \
qtbase5-dev qt5-qmake \
qtbase5-dev \
qt5-qmake \
build-essential \
liblapack-dev \
libatlas-base-dev \
Expand All @@ -89,6 +90,8 @@ RUN \
libsm6 \
libxext6 \
libxrender1 \
libwebpmux3 \
libwebpdemux2 \
&& \
pip install numpy && \
# Install OpenCV
Expand Down Expand Up @@ -116,6 +119,7 @@ RUN \
-D PYTHON${PYTHON_VERSION%%.*}_EXECUTABLE=$(which python${PYTHON_VERSION}) \
-D PYTHON_DEFAULT_EXECUTABLE=$(which python${PYTHON_VERSION}) \
-D BUILD_EXAMPLES=OFF \
-D BUILD_opencv_highgui=OFF \
-D WITH_IPP=OFF \
-D WITH_FFMPEG=ON \
-D WITH_GSTREAMER=ON \
Expand Down
Loading