docker: update all generated docker images to Go 1.23.1

Signed-off-by: deadprogram <[email protected]>
hybridgroup · Sep 9, 2024 · d978659 · d978659
1 parent b87a0f3
commit d978659
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \