docker: update OpenCV to 4.8.0

Signed-off-by: deadprogram <[email protected]>
hybridgroup · Jul 21, 2023 · 0cce50d · 0cce50d
1 parent 7e101c3
commit 0cce50d
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -53,9 +53,9 @@ jobs:
           push: true
           tags: |
             gocv/opencv:latest
-            gocv/opencv:4.7.0
+            gocv/opencv:4.8.0
             ghcr.io/${{ github.repository_owner }}/opencv:latest
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -76,8 +76,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/opencv:4.7.0-gpu-cuda-10
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-gpu-cuda-10
+            gocv/opencv:4.8.0-gpu-cuda-10
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-10
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -100,8 +100,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-gpu-cuda-10
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-gpu-cuda-10
+            gocv/opencv:4.8.0-gpu-cuda-10
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-10
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -122,8 +122,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/4.7.0-gpu-cuda-11
-            ghcr.io/${{ github.repository_owner }}/4.7.0-gpu-cuda-11
+            gocv/4.8.0-gpu-cuda-11
+            ghcr.io/${{ github.repository_owner }}/4.8.0-gpu-cuda-11
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -146,8 +146,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-gpu-cuda-11
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-gpu-cuda-11
+            gocv/opencv:4.8.0-gpu-cuda-11
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -168,8 +168,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/opencv:4.7.0-gpu-cuda-11.2.2
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-gpu-cuda-11.2.2
+            gocv/opencv:4.8.0-gpu-cuda-11.2.2
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11.2.2
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -192,8 +192,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-gpu-cuda-11.2.2
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-gpu-cuda-11.2.2
+            gocv/opencv:4.8.0-gpu-cuda-11.2.2
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11.2.2
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -214,8 +214,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/opencv:4.7.0-ubuntu-18.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-18.04
+            gocv/opencv:4.8.0-ubuntu-18.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-18.04
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -238,8 +238,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-ubuntu-18.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-18.04
+            gocv/opencv:4.8.0-ubuntu-18.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-18.04
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -260,8 +260,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/opencv:4.7.0-ubuntu-20.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-20.04
+            gocv/opencv:4.8.0-ubuntu-20.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-20.04
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -284,8 +284,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-ubuntu-20.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-20.04
+            gocv/opencv:4.8.0-ubuntu-20.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-20.04
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -306,8 +306,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            gocv/opencv:4.7.0-ubuntu-22.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-22.04
+            gocv/opencv:4.8.0-ubuntu-22.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-22.04
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -330,8 +330,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.7.0-ubuntu-22.04
-            ghcr.io/${{ github.repository_owner }}/opencv:4.7.0-ubuntu-22.04
+            gocv/opencv:4.8.0-ubuntu-22.04
+            ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-22.04
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # to build this docker image:
 #   docker build .
-FROM ghcr.io/hybridgroup/opencv:4.7.0
+FROM ghcr.io/hybridgroup/opencv:4.8.0
 
 ENV GOPATH /go
 

diff --git a/Dockerfile-test b/Dockerfile-test
@@ -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.7.0 AS gocv-test-4.7
+FROM ghcr.io/hybridgroup/opencv:4.8.0 AS gocv-test-4.7
 
 ENV GOPATH /go
 

diff --git a/Dockerfile-test.gpu-cuda-10 b/Dockerfile-test.gpu-cuda-10
@@ -4,7 +4,7 @@
 # To run tests:
 #   docker run -it --rm --gpus all gocv-test-gpu-cuda-10
 #
-FROM ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10
+FROM ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10
 
 ENV GOPATH /go
 ENV PATH="${PATH}:/go/bin"

diff --git a/Dockerfile-test.gpu-cuda-11 b/Dockerfile-test.gpu-cuda-11
@@ -4,7 +4,7 @@
 # To run tests:
 #   docker run -it --rm --gpus all gocv-test-gpu-cuda-11
 #
-FROM ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11
+FROM ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11
 
 ENV GOPATH /go
 ENV PATH="${PATH}:/go/bin"

diff --git a/Dockerfile-test.gpu-cuda-11.2.2 b/Dockerfile-test.gpu-cuda-11.2.2
@@ -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.7.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11
+FROM ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11
 
 ENV GOPATH /go
 ENV PATH="${PATH}:/go/bin"

diff --git a/Dockerfile.gpu b/Dockerfile.gpu
@@ -1,6 +1,6 @@
 # to build this docker image:
 #   docker build -f Dockerfile.gpu .
-FROM ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-11 AS gocv-gpu
+FROM ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-11 AS gocv-gpu
 
 ENV GOPATH /go
 

diff --git a/Dockerfile.opencv b/Dockerfile.opencv
@@ -1,10 +1,10 @@
 # OpenCV 4 prebuilt multiarchitecture image
 #
 # To build release:
-#   docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.7.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.8.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.7.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.8.0-dev --platform=linux/arm64,linux/amd64 --push .
 
 
 ###################
@@ -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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"
@@ -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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"

diff --git a/Dockerfile.opencv-gpu-cuda-10 b/Dockerfile.opencv-gpu-cuda-10
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-10 .
+#   docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-10 .
 FROM nvidia/cuda:10.2-cudnn8-devel AS opencv-gpu-base
 LABEL maintainer="hybridgroup"
 
@@ -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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \

diff --git a/Dockerfile.opencv-gpu-cuda-11 b/Dockerfile.opencv-gpu-cuda-11
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-11 .
+#   docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.8.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.8.0-dev-gpu-cuda-11 .
 FROM nvidia/cuda:11.5.2-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base
 LABEL maintainer="hybridgroup"
@@ -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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"

diff --git a/Dockerfile.opencv-gpu-cuda-11.2.2 b/Dockerfile.opencv-gpu-cuda-11.2.2
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.7.0-gpu-cuda-11.2.2 .
+#   docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-11.2.2 .
 #   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.8.0-dev-gpu-cuda-11.2.2 .
 FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base
 LABEL maintainer="hybridgroup"
@@ -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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"

diff --git a/Dockerfile.opencv-openvino b/Dockerfile.opencv-openvino
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.7.0-openvino
+#   docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.8.0-openvino
 FROM openvino/ubuntu20_dev:2022.1.0 AS opencv-openvino-base
 LABEL maintainer="hybridgroup"
 ENV DEBIAN_FRONTEND=noninteractive
@@ -11,7 +11,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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \

diff --git a/Dockerfile.opencv-ubuntu-18.04 b/Dockerfile.opencv-ubuntu-18.04
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.7.0-ubuntu-18.04 .
+#   docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.8.0-ubuntu-18.04 .
 #   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-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.8.0-dev-ubuntu-18.04 .
 FROM ubuntu:18.04 AS opencv-base
 LABEL maintainer="hybridgroup"
@@ -11,7 +11,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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"

diff --git a/Dockerfile.opencv-ubuntu-20.04 b/Dockerfile.opencv-ubuntu-20.04
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.7.0-ubuntu-20.04 .
+#   docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.8.0-ubuntu-20.04 .
 #   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-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.8.0-dev-ubuntu-20.04 .
 FROM ubuntu:20.04 AS opencv-base
 LABEL maintainer="hybridgroup"
@@ -14,7 +14,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.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"

diff --git a/Dockerfile.opencv-ubuntu-22.04 b/Dockerfile.opencv-ubuntu-22.04
@@ -1,5 +1,5 @@
 # to build this docker image:
-#   docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.7.0-ubuntu-22.04 .
+#   docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.8.0-ubuntu-22.04 .
 #   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-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.8.0-dev-ubuntu-20.04 .
 FROM ubuntu:22.04 AS opencv-base
 LABEL maintainer="hybridgroup"
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
             libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \
             rm -rf /var/lib/apt/lists/*
 
-ARG OPENCV_VERSION="4.7.0"
+ARG OPENCV_VERSION="4.8.0"
 ENV OPENCV_VERSION $OPENCV_VERSION
 
 ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"