diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 4103fa7..da43ba6 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.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 diff --git a/README.md b/README.md index d59fa75..9ce36ab 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.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 diff --git a/cpu/Dockerfile b/cpu/Dockerfile index ca8891f..b85c212 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.10.0" +ARG OPENCV_VERSION="4.11.0" # Needed for string substitution SHELL ["/bin/bash", "-c"] @@ -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 \ @@ -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 && \ @@ -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 \ @@ -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/* diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 43e329e..0141536 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.10.0" +ARG OPENCV_VERSION="4.11.0" # Needed for string substitution SHELL ["/bin/bash", "-c"] @@ -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 \ @@ -89,6 +90,8 @@ RUN \ libsm6 \ libxext6 \ libxrender1 \ + libwebpmux3 \ + libwebpdemux2 \ && \ pip install numpy && \ # Install OpenCV @@ -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 \