From 14cd2c963f80b8493ff53f033fc70f33dd556dc4 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 19 Jul 2023 12:13:28 +0200 Subject: [PATCH 1/2] bump opencv to 4.8.0 --- .github/workflows/docker-builds.yml | 2 +- README.md | 4 ++-- cpu/Dockerfile | 2 +- gpu/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index d2a15df..e8ac3ea 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] - opencv_version: ["4.7.0"] + opencv_version: ["4.8.0"] device: ["cpu", "gpu"] steps: - name: Checkout diff --git a/README.md b/README.md index a4caf1e..e5e2fb7 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.6.x, FFmpeg -- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.6.x, FFmpeg with CUDA 11.4 support +- `: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 ## Build diff --git a/cpu/Dockerfile b/cpu/Dockerfile index e6e447a..a2fb33e 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:20.04 LABEL maintainer="https://github.com/Borda" ARG PYTHON_VERSION=3.9 -ARG OPENCV_VERSION=4.7.0 +ARG OPENCV_VERSION=4.8.0 # Needed for string substitution SHELL ["/bin/bash", "-c"] diff --git a/gpu/Dockerfile b/gpu/Dockerfile index b08d3c4..5601740 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -12,7 +12,7 @@ FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 LABEL maintainer="https://github.com/Borda" ARG PYTHON_VERSION=3.9 -ARG OPENCV_VERSION=4.7.0 +ARG OPENCV_VERSION=4.8.0 # Needed for string substitution SHELL ["/bin/bash", "-c"] From ca6cd6747ea29ab850abe6f64f4d0d4088012985 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 19 Jul 2023 12:27:27 +0200 Subject: [PATCH 2/2] cuda 11.7.1 --- gpu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 5601740..059674d 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -5,7 +5,7 @@ # CALL: docker image build -t python-opencv-ffmpeg:py36 -f cpu/Dockerfile --build-arg PYTHON_VERSION=3.6 . -ARG CUDA_VERSION=11.4.0 +ARG CUDA_VERSION=11.7.1 FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04