From e15d3ea816a08d77519bf3ad16ca6f43de9b3ee2 Mon Sep 17 00:00:00 2001 From: deadprogram Date: Mon, 14 Aug 2023 13:09:50 +0200 Subject: [PATCH] docker: update container images to Go 1.21 Signed-off-by: deadprogram --- Dockerfile.opencv | 4 ++-- Dockerfile.opencv-gpu-cuda-10 | 2 +- Dockerfile.opencv-gpu-cuda-11 | 2 +- Dockerfile.opencv-gpu-cuda-11.2.2 | 2 +- Dockerfile.opencv-gpu-cuda-12 | 2 +- Dockerfile.opencv-openvino | 2 +- Dockerfile.opencv-static | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile.opencv b/Dockerfile.opencv index c1d32100..ff98b372 100644 --- a/Dockerfile.opencv +++ b/Dockerfile.opencv @@ -11,7 +11,7 @@ # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.20-buster AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.21-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y \ @@ -70,7 +70,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ # amd64 build stage ################### -FROM --platform=linux/arm64 golang:1.20-buster AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.21-bullseye AS opencv-base-arm64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/Dockerfile.opencv-gpu-cuda-10 b/Dockerfile.opencv-gpu-cuda-10 index 6d70c872..c4295955 100644 --- a/Dockerfile.opencv-gpu-cuda-10 +++ b/Dockerfile.opencv-gpu-cuda-10 @@ -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.20.2 +ENV GO_RELEASE=1.21.0 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 diff --git a/Dockerfile.opencv-gpu-cuda-11 b/Dockerfile.opencv-gpu-cuda-11 index eb32de23..bce5b686 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -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.20.6 +ENV GO_RELEASE=1.21.0 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 diff --git a/Dockerfile.opencv-gpu-cuda-11.2.2 b/Dockerfile.opencv-gpu-cuda-11.2.2 index 4f25070f..6a100b3a 100644 --- a/Dockerfile.opencv-gpu-cuda-11.2.2 +++ b/Dockerfile.opencv-gpu-cuda-11.2.2 @@ -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.20.6 +ENV GO_RELEASE=1.21.0 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 diff --git a/Dockerfile.opencv-gpu-cuda-12 b/Dockerfile.opencv-gpu-cuda-12 index 8c9722b3..9431fac8 100644 --- a/Dockerfile.opencv-gpu-cuda-12 +++ b/Dockerfile.opencv-gpu-cuda-12 @@ -65,7 +65,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-12-base AS opencv-gpu-cuda-12-golang -ENV GO_RELEASE=1.20.6 +ENV GO_RELEASE=1.21.0 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 diff --git a/Dockerfile.opencv-openvino b/Dockerfile.opencv-openvino index 065b9d72..601861f5 100644 --- a/Dockerfile.opencv-openvino +++ b/Dockerfile.opencv-openvino @@ -48,7 +48,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO # install golang here FROM opencv-openvino-base AS opencv-openvino-golang -ENV GO_RELEASE=1.20.2 +ENV GO_RELEASE=1.21.0 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 diff --git a/Dockerfile.opencv-static b/Dockerfile.opencv-static index 15b0b30d..0eba1cb8 100644 --- a/Dockerfile.opencv-static +++ b/Dockerfile.opencv-static @@ -11,7 +11,7 @@ # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.20-buster AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.21-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y \ @@ -72,7 +72,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ # arm64 build stage ################### -FROM --platform=linux/arm64 golang:1.20-buster AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.21-bullseye AS opencv-base-arm64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y --no-install-recommends \