From 4968862828f1ef4a7c8dacfe9b1d0ffe8d129b27 Mon Sep 17 00:00:00 2001 From: deadprogram Date: Fri, 6 Oct 2023 15:27:57 +0200 Subject: [PATCH] docker: update OpenCV base images to 4.8.1 Signed-off-by: deadprogram --- .github/workflows/docker.yml | 64 +++++++++++++++---------------- Dockerfile.opencv | 12 +++--- Dockerfile.opencv-gpu-cuda-10 | 6 +-- Dockerfile.opencv-gpu-cuda-11 | 8 ++-- Dockerfile.opencv-gpu-cuda-11.2.2 | 8 ++-- Dockerfile.opencv-gpu-cuda-12 | 8 ++-- Dockerfile.opencv-openvino | 6 +-- Dockerfile.opencv-static | 10 ++--- Dockerfile.opencv-ubuntu-18.04 | 8 ++-- Dockerfile.opencv-ubuntu-20.04 | 8 ++-- Dockerfile.opencv-ubuntu-22.04 | 8 ++-- 11 files changed, 73 insertions(+), 73 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 540360e9..4d3983c1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -28,8 +28,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0 + gocv/opencv:4.8.1 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1 tags: | type=sha,format=long type=raw,value=latest @@ -53,9 +53,9 @@ jobs: push: true tags: | gocv/opencv:latest - gocv/opencv:4.8.0 + gocv/opencv:4.8.1 ghcr.io/${{ github.repository_owner }}/opencv:latest - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -78,8 +78,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-static + gocv/opencv:4.8.1-static + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-static tags: | type=sha,format=long type=raw,value=latest @@ -102,8 +102,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-static + gocv/opencv:4.8.1-static + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-static labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -124,8 +124,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11 + gocv/opencv:4.8.1-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-gpu-cuda-11 tags: | type=sha,format=long type=raw,value=latest @@ -148,8 +148,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11 + gocv/opencv:4.8.1-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-gpu-cuda-11 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -170,8 +170,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11.2.2 + gocv/opencv:4.8.1-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-gpu-cuda-11.2.2 tags: | type=sha,format=long type=raw,value=latest @@ -194,8 +194,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-11.2.2 + gocv/opencv:4.8.1-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-gpu-cuda-11.2.2 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -216,8 +216,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opemcv:4.8.0-gpu-cuda-12 + gocv/opencv:4.8.1-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opemcv:4.8.1-gpu-cuda-12 tags: | type=sha,format=long type=raw,value=latest @@ -240,8 +240,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-gpu-cuda-12 + gocv/opencv:4.8.1-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-gpu-cuda-12 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -262,8 +262,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-18.04 + gocv/opencv:4.8.1-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-18.04 tags: | type=sha,format=long type=raw,value=latest @@ -286,8 +286,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-18.04 + gocv/opencv:4.8.1-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-18.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -308,8 +308,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-20.04 + gocv/opencv:4.8.1-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-20.04 tags: | type=sha,format=long type=raw,value=latest @@ -332,8 +332,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-20.04 + gocv/opencv:4.8.1-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-20.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -354,8 +354,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.8.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-22.04 + gocv/opencv:4.8.1-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-22.04 tags: | type=sha,format=long type=raw,value=latest @@ -378,8 +378,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.8.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.8.0-ubuntu-22.04 + gocv/opencv:4.8.1-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.8.1-ubuntu-22.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/Dockerfile.opencv b/Dockerfile.opencv index ff98b372..a9ee794c 100644 --- 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.8.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.1 -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.8.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.1-dev --platform=linux/arm64,linux/amd64 --push . ################### @@ -19,11 +19,11 @@ RUN apt-get update && apt-get install -y \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg62-turbo-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -78,11 +78,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg62-turbo-dev libpng-dev libtiff-dev libdc1394-22-dev && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64 -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index c4295955..3632ff3c 100644 --- 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.8.0-gpu-cuda-10 . +# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.8.1-gpu-cuda-10 . FROM nvidia/cuda:10.2-cudnn8-devel AS opencv-gpu-base LABEL maintainer="hybridgroup" @@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index bce5b686..89bb8a51 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -1,6 +1,6 @@ # to build this docker image: -# 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 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.8.1-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.1-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 @@ -10,9 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index 6a100b3a..61733561 100644 --- a/Dockerfile.opencv-gpu-cuda-11.2.2 +++ b/Dockerfile.opencv-gpu-cuda-11.2.2 @@ -1,6 +1,6 @@ # to build this docker image: -# 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 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.8.1-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.1-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" ENV DEBIAN_FRONTEND=noninteractive @@ -10,9 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-gpu-cuda-12 b/Dockerfile.opencv-gpu-cuda-12 index 9431fac8..619b503f 100644 --- a/Dockerfile.opencv-gpu-cuda-12 +++ b/Dockerfile.opencv-gpu-cuda-12 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.8.0-gpu-cuda-12 . -# 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-12 -t ghcr.io/hybridgroup/opencv:4.8.0-dev-gpu-cuda-12 . +# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.8.1-gpu-cuda-12 . +# 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-12 -t ghcr.io/hybridgroup/opencv:4.8.1-dev-gpu-cuda-12 . FROM nvidia/cuda:12.1.0-cudnn8-devel-ubuntu22.04 AS opencv-gpu-cuda-12-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -10,9 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index 601861f5..96ce5aa6 100644 --- 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.8.0-openvino +# docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.8.1-openvino FROM openvino/ubuntu20_dev:2022.1.0 AS opencv-openvino-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \ diff --git a/Dockerfile.opencv-static b/Dockerfile.opencv-static index 0eba1cb8..b4d1e650 100644 --- a/Dockerfile.opencv-static +++ b/Dockerfile.opencv-static @@ -1,10 +1,10 @@ # OpenCV 4 prebuilt multiarchitecture image # # To build release: -# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.8.0-static --platform=linux/arm64,linux/amd64 --push . +# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.8.1-static --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.8.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.1-dev --platform=linux/arm64,linux/amd64 --push . ################### @@ -19,11 +19,11 @@ RUN apt-get update && apt-get install -y \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg62-turbo-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -84,7 +84,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.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-18.04 b/Dockerfile.opencv-ubuntu-18.04 index 0cf174dd..5295d6ba 100644 --- a/Dockerfile.opencv-ubuntu-18.04 +++ b/Dockerfile.opencv-ubuntu-18.04 @@ -1,6 +1,6 @@ # to build this docker image: -# 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 . +# docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.8.1-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.1-dev-ubuntu-18.04 . FROM ubuntu:18.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index 0e7019c7..5dcbf339 100644 --- a/Dockerfile.opencv-ubuntu-20.04 +++ b/Dockerfile.opencv-ubuntu-20.04 @@ -1,6 +1,6 @@ # to build this docker image: -# 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 . +# docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.8.1-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.1-dev-ubuntu-20.04 . FROM ubuntu:20.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -12,9 +12,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" 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 index 42ad9184..ef15c11c 100644 --- a/Dockerfile.opencv-ubuntu-22.04 +++ b/Dockerfile.opencv-ubuntu-22.04 @@ -1,6 +1,6 @@ # to build this docker image: -# 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 . +# docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.8.1-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.1-dev-ubuntu-20.04 . FROM ubuntu:22.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -12,9 +12,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ - rm -rf /var/lib/apt/lists/* + apt-get autoremove -y && apt-get autoclean -y -ARG OPENCV_VERSION="4.8.0" +ARG OPENCV_VERSION="4.8.1" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip"