From d978659ed3f9168226d0bbe7e9f523772e1439dd Mon Sep 17 00:00:00 2001 From: deadprogram Date: Mon, 9 Sep 2024 23:16:45 +0200 Subject: [PATCH] docker: update all generated docker images to Go 1.23.1 Signed-off-by: deadprogram --- Dockerfile-test | 2 +- Dockerfile.opencv | 6 +++--- 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 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile-test b/Dockerfile-test index 387cb8c2..91813c9f 100644 --- 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.10.0 AS gocv-test-4.7 +FROM ghcr.io/hybridgroup/opencv:4.10.0 AS gocv-test-4.10 ENV GOPATH /go diff --git a/Dockerfile.opencv b/Dockerfile.opencv index ea970df8..c3e7fd38 100644 --- a/Dockerfile.opencv +++ b/Dockerfile.opencv @@ -11,7 +11,7 @@ # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.22-bullseye AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.23-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y \ @@ -69,10 +69,10 @@ RUN cd opencv-${OPENCV_VERSION} && \ ################### -# amd64 build stage +# arm64 build stage ################### -FROM --platform=linux/arm64 golang:1.22-bullseye AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.23-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 b4b69488..12c0b904 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.22.3 +ENV GO_RELEASE=1.23.1 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 3630e0e4..98b74db6 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -67,7 +67,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.3 +ENV GO_RELEASE=1.23.1 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 22f34415..67280353 100644 --- a/Dockerfile.opencv-gpu-cuda-11.2.2 +++ b/Dockerfile.opencv-gpu-cuda-11.2.2 @@ -67,7 +67,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.3 +ENV GO_RELEASE=1.23.1 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 334b0dfe..f3ea5e42 100644 --- a/Dockerfile.opencv-gpu-cuda-12 +++ b/Dockerfile.opencv-gpu-cuda-12 @@ -67,7 +67,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.22.3 +ENV GO_RELEASE=1.23.1 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 cca22579..dae1dbeb 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.22.3 +ENV GO_RELEASE=1.23.1 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 870398e2..a104d021 100644 --- a/Dockerfile.opencv-static +++ b/Dockerfile.opencv-static @@ -11,7 +11,7 @@ # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.22-bullseye AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.23-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y \ @@ -74,7 +74,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ # arm64 build stage ################### -FROM --platform=linux/arm64 golang:1.22-bullseye AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.23-bullseye AS opencv-base-arm64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y --no-install-recommends \