From dcc34f6d09706a5b62a0cb69dac0fbc66059c66f Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Sun, 31 Dec 2023 22:36:21 +0100 Subject: [PATCH] bump: OpenCV `4.9.0` (#41) --- .github/workflows/docker-builds.yml | 10 +++++----- README.md | 4 ++-- cpu/Dockerfile | 2 +- gpu/Dockerfile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 0d6503a..9272b00 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.8.1"] + opencv_version: ["4.9.0"] device: ["cpu", "gpu"] include: - - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.8.1", device: "cpu" } - - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.8.1", device: "gpu" } - - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.8.1", device: "cpu" } - - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.8.1", device: "gpu" } + - { 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" } steps: - name: Checkout uses: actions/checkout@v4 diff --git a/README.md b/README.md index 299a16a..cfce837 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.8.x, FFmpeg -- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.8.x, FFmpeg with CUDA 11.4 support +- `: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 ## Build diff --git a/cpu/Dockerfile b/cpu/Dockerfile index 8cf0b5e..2fdc269 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.8.0 +ARG OPENCV_VERSION=4.9.0 # Needed for string substitution SHELL ["/bin/bash", "-c"] diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 57284a1..dcb13f5 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.8.0 +ARG OPENCV_VERSION=4.9.0 # Needed for string substitution SHELL ["/bin/bash", "-c"]