diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 9272b00..52ab7ef 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -19,13 +19,13 @@ jobs: matrix: ubuntu_version: ["20.04"] python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"] - opencv_version: ["4.9.0"] + opencv_version: ["4.10.0"] device: ["cpu", "gpu"] include: - - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.9.0", device: "cpu" } - - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.9.0", device: "gpu" } - - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.9.0", device: "cpu" } - - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.9.0", device: "gpu" } + - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" } + - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu" } + - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" } + - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu" } steps: - name: Checkout uses: actions/checkout@v4 diff --git a/README.md b/README.md index cfce837..4a09b32 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 2.x/3.x, OpenCV 4.9.x, FFmpeg -- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.9.x, FFmpeg with CUDA 11.4 support +- `:cpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg +- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg with CUDA 11.4 support ## Build diff --git a/cpu/Dockerfile b/cpu/Dockerfile index 2fdc269..577f1df 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -1,14 +1,14 @@ # https://www.learnopencv.com/install-opencv3-on-ubuntu/ # https://www.osradar.com/how-to-install-opencv-on-ubuntu-20-04/ -ARG UBUNTU_VERSION=22.04 +ARG UBUNTU_VERSION="22.04" FROM ubuntu:${UBUNTU_VERSION} LABEL maintainer="https://github.com/Borda" -ARG PYTHON_VERSION=3.9 -ARG OPENCV_VERSION=4.9.0 +ARG PYTHON_VERSION="3.9" +ARG OPENCV_VERSION="4.10.0" # Needed for string substitution SHELL ["/bin/bash", "-c"] diff --git a/gpu/Dockerfile b/gpu/Dockerfile index dcb13f5..0c54ca9 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -5,15 +5,15 @@ # CALL: docker image build -t python-opencv-ffmpeg:py36 -f cpu/Dockerfile --build-arg PYTHON_VERSION=3.6 . -ARG CUDA_VERSION=11.8.0 -ARG UBUNTU_VERSION=22.04 +ARG CUDA_VERSION="11.8.0" +ARG UBUNTU_VERSION="22.04" FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION} LABEL maintainer="https://github.com/Borda" -ARG PYTHON_VERSION=3.9 -ARG OPENCV_VERSION=4.9.0 +ARG PYTHON_VERSION="3.9" +ARG OPENCV_VERSION="4.10.0" # Needed for string substitution SHELL ["/bin/bash", "-c"]