all: update Go to version 1.22

hybridgroup · Feb 9, 2024 · 7db1370 · 7db1370
1 parent bf0a85d
commit 7db1370
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile.opencv b/Dockerfile.opencv
@@ -11,7 +11,7 @@
 # amd64 build stage
 ###################
 
-FROM --platform=linux/amd64 golang:1.21-bullseye AS opencv-base-amd64
+FROM --platform=linux/amd64 golang:1.22-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.21-bullseye AS opencv-base-arm64
+FROM --platform=linux/arm64 golang:1.22-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.21.0
+ENV GO_RELEASE=1.22.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
@@ -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.21.0
+ENV GO_RELEASE=1.22.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
@@ -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.21.0
+ENV GO_RELEASE=1.22.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
@@ -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.21.0
+ENV GO_RELEASE=1.22.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
@@ -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.21.0
+ENV GO_RELEASE=1.22.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
@@ -11,7 +11,7 @@
 # amd64 build stage
 ###################
 
-FROM --platform=linux/amd64 golang:1.21-bullseye AS opencv-base-amd64
+FROM --platform=linux/amd64 golang:1.22-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.21-bullseye AS opencv-base-arm64
+FROM --platform=linux/arm64 golang:1.22-bullseye AS opencv-base-arm64
 LABEL maintainer="hybridgroup"
 
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ GOCV_VERSION?="v0.35.0"
 OPENCV_VERSION?=4.9.0
 
 # Go version to use when building Docker image
-GOVERSION?=1.21.1
+GOVERSION?=1.22.0
 
 # Temporary directory to put files into.
 TMP_DIR?=/tmp/

diff --git a/README.md b/README.md
@@ -273,7 +273,7 @@ make docker
 By default Docker image built by running the command above ships [Go](https://golang.org/) version `1.20.2`, but if you would like to build an image which uses different version of `Go` you can override the default value when running the target command:
 
 ```
-make docker GOVERSION='1.19.4'
+make docker GOVERSION='1.22.0'
 ```
 
 #### Running GUI programs in Docker on macOS

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ platform:
 environment:
  GOPATH: c:\gopath
  GOROOT: c:\go
- GOVERSION: 1.19
+ GOVERSION: 1.22
  TEST_EXTERNAL: 1
  APPVEYOR_SAVE_CACHE_ON_ERROR: true