Skip to content

Commit

Permalink
all: update to OpenCV 4.10.0
Browse files Browse the repository at this point in the history
Signed-off-by: deadprogram <[email protected]>
  • Loading branch information
deadprogram committed Jun 4, 2024
1 parent 2889527 commit acb4245
Show file tree
Hide file tree
Showing 29 changed files with 132 additions and 132 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0
gocv/opencv:4.10.0
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -53,9 +53,9 @@ jobs:
push: true
tags: |
gocv/opencv:latest
gocv/opencv:4.9.0
gocv/opencv:4.10.0
ghcr.io/${{ github.repository_owner }}/opencv:latest
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -78,8 +78,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-static
gocv/opencv:4.10.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-static
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -102,8 +102,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-static
gocv/opencv:4.10.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-static
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -156,8 +156,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11
gocv/opencv:4.10.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -180,8 +180,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11
gocv/opencv:4.10.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -234,8 +234,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11.2.2
gocv/opencv:4.10.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11.2.2
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -258,8 +258,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11.2.2
gocv/opencv:4.10.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11.2.2
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -312,8 +312,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opemcv:4.9.0-gpu-cuda-12
gocv/opencv:4.10.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opemcv:4.10.0-gpu-cuda-12
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -336,8 +336,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-12
gocv/opencv:4.10.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-12
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -358,8 +358,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-18.04
gocv/opencv:4.10.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-18.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -382,8 +382,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-18.04
gocv/opencv:4.10.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-18.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -404,8 +404,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-20.04
gocv/opencv:4.10.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-20.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -428,8 +428,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-20.04
gocv/opencv:4.10.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-20.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -450,8 +450,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
gocv/opencv:4.9.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-22.04
gocv/opencv:4.10.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-22.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -474,8 +474,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.9.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-22.04
gocv/opencv:4.10.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-22.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/hybridgroup/opencv:4.9.0
container: ghcr.io/hybridgroup/opencv:4.10.0

steps:
- name: Checkout
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,47 +26,47 @@ jobs:
uses: actions/cache/restore@v4
id: cache-opencv-source
with:
key: opencv-source-490-windows-v1a
key: opencv-source-410-windows-v1a
path: |
./opencv/opencv-4.9.0
./opencv/opencv_contrib-4.9.0
./opencv/opencv-4.10.0
./opencv/opencv_contrib-4.10.0
- name: Download OpenCV source
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
shell: bash
run: |
mkdir -p ./opencv
curl -Lo ./opencv/opencv-4.9.0.zip https://github.com/opencv/opencv/archive/4.9.0.zip
curl -Lo ./opencv/opencv_contrib-4.9.0.zip https://github.com/opencv/opencv_contrib/archive/4.9.0.zip
curl -Lo ./opencv/opencv-4.10.0.zip https://github.com/opencv/opencv/archive/4.10.0.zip
curl -Lo ./opencv/opencv_contrib-4.10.0.zip https://github.com/opencv/opencv_contrib/archive/4.10.0.zip
- name: Extract OpenCV source
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
shell: bash
run: |
cd ./opencv
mkdir -p opencv-4.9.0
mkdir -p opencv_contrib-4.9.0
7z x opencv-4.9.0.zip
7z x opencv_contrib-4.9.0.zip
mkdir -p opencv-4.10.0
mkdir -p opencv_contrib-4.10.0
7z x opencv-4.10.0.zip
7z x opencv_contrib-4.10.0.zip
- name: Save cached OpenCV source
uses: actions/cache/save@v4
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
with:
key: ${{ steps.cache-opencv-source.outputs.cache-primary-key }}
path: |
./opencv/opencv-4.9.0
./opencv/opencv_contrib-4.9.0
./opencv/opencv-4.10.0
./opencv/opencv_contrib-4.10.0
- name: Restore cached OpenCV build
uses: actions/cache/restore@v4
id: cache-opencv-build
with:
key: opencv-build-490-windows-v1d
key: opencv-build-410-windows-v1d
path: |
./opencv/build
- name: Build OpenCV
if: steps.cache-opencv-build.outputs.cache-hit != 'true'
run: |
mkdir -p ./opencv/build
cd ./opencv/build
cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.9.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.9.0
cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.10.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.10.0
cmake --build . --target install
- name: Save cached OpenCV build
uses: actions/cache/save@v4
Expand All @@ -80,7 +80,7 @@ jobs:
go env
echo "CGO_CXXFLAGS=--std=c++11" >> $env:GITHUB_ENV
echo "CGO_CPPFLAGS=-I${env:GITHUB_WORKSPACE}\opencv\build\install\include" >> $env:GITHUB_ENV
echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 -lopencv_calib3d490 -lopencv_bgsegm490 -lopencv_photo490 -lopencv_aruco490 -lopencv_wechat_qrcode490 -lopencv_ximgproc490 -lopencv_xphoto490" >> $env:GITHUB_ENV
echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 -lopencv_calib3d410 -lopencv_bgsegm410 -lopencv_photo410 -lopencv_aruco410 -lopencv_wechat_qrcode410 -lopencv_ximgproc410 -lopencv_xphoto410" >> $env:GITHUB_ENV
echo "${env:GITHUB_WORKSPACE}/opencv/build/install/x64/mingw/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Test GoCV
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# to build this docker image:
# docker build .
FROM ghcr.io/hybridgroup/opencv:4.9.0
FROM ghcr.io/hybridgroup/opencv:4.10.0

ENV GOPATH /go

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# docker run -it --rm -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix gocv-test-4.x
# xhost -
#
FROM ghcr.io/hybridgroup/opencv:4.9.0 AS gocv-test-4.7
FROM ghcr.io/hybridgroup/opencv:4.10.0 AS gocv-test-4.7

ENV GOPATH /go

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-10
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-10
#
FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10
FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-11
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-11
#
FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11
FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-11.2.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-11.2.2
#
FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11
FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-12
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-12
#
FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12
FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gpu
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# to build this docker image:
# docker build -f Dockerfile.gpu .
FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 AS gocv-gpu
FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 AS gocv-gpu

ENV GOPATH /go

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.opencv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OpenCV 4 prebuilt multiarchitecture image
#
# To build release:
# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.9.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push .
# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.10.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push .
#
# To build prerelease:
# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.9.0-dev --platform=linux/arm64,linux/amd64 --push .
# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.10.0-dev --platform=linux/arm64,linux/amd64 --push .


###################
Expand All @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \

FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64

ARG OPENCV_VERSION="4.9.0"
ARG OPENCV_VERSION="4.10.0"
ENV OPENCV_VERSION $OPENCV_VERSION

ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64

ARG OPENCV_VERSION="4.9.0"
ARG OPENCV_VERSION="4.10.0"
ENV OPENCV_VERSION $OPENCV_VERSION

ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.opencv-gpu-cuda-10
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# to build this docker image:
# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-10 .
# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-10 .
FROM nvidia/cuda:10.2-cudnn8-devel AS opencv-gpu-base
LABEL maintainer="hybridgroup"

Expand All @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \
rm -rf /var/lib/apt/lists/*

ARG OPENCV_VERSION="4.9.0"
ARG OPENCV_VERSION="4.10.0"
ENV OPENCV_VERSION $OPENCV_VERSION

RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \
Expand Down Expand Up @@ -59,7 +59,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO
# install golang here
FROM opencv-gpu-base AS opencv-gpu-golang

ENV GO_RELEASE=1.22.0
ENV GO_RELEASE=1.22.3
RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \
tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \
rm go${GO_RELEASE}.linux-amd64.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.opencv-gpu-cuda-11
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# to build this docker image:
# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 .
# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-gpu-cuda-11 .
# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 .
# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-gpu-cuda-11 .
FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base
LABEL maintainer="hybridgroup"
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \
rm -rf /var/lib/apt/lists/*

ARG OPENCV_VERSION="4.9.0"
ARG OPENCV_VERSION="4.10.0"
ENV OPENCV_VERSION $OPENCV_VERSION

ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"
Expand Down Expand Up @@ -65,7 +65,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \
# install golang here
FROM opencv-gpu-cuda-11-base AS opencv-gpu-cuda-11-golang

ENV GO_RELEASE=1.22.0
ENV GO_RELEASE=1.22.3
RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \
tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \
rm go${GO_RELEASE}.linux-amd64.tar.gz
Expand Down
Loading

0 comments on commit acb4245

Please sign in to comment.