Skip to content

Commit

Permalink
docker: update OpenCV base images to 4.8.1
Browse files Browse the repository at this point in the history
Signed-off-by: deadprogram <[email protected]>
  • Loading branch information
deadprogram committed Oct 6, 2023
1 parent 579545a commit ad88549
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 62 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.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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
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.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 .


###################
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.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"
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.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"
Expand Down
4 changes: 2 additions & 2 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.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"

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.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 && \
Expand Down
6 changes: 3 additions & 3 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.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
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.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"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.opencv-gpu-cuda-11.2.2
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.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
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.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"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.opencv-gpu-cuda-12
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-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
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-dev nasm && \
rm -rf /var/lib/apt/lists/*

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"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.opencv-openvino
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.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 && \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.opencv-static
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-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 .


###################
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.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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.opencv-ubuntu-18.04
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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.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"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.opencv-ubuntu-20.04
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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.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"
Expand Down
Loading

0 comments on commit ad88549

Please sign in to comment.