Skip to content

Commit

Permalink
bump: OpenCV 4.10.0 (#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda committed Jun 4, 2024
1 parent 034abc7 commit 324dc2b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
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 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

Expand Down
6 changes: 3 additions & 3 deletions cpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
8 changes: 4 additions & 4 deletions gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 324dc2b

Please sign in to comment.