From 7db13704b425872e8f018221b19c85ee97d9b57d Mon Sep 17 00:00:00 2001 From: Michal Miszczyk Date: Fri, 9 Feb 2024 23:26:58 +0100 Subject: [PATCH] all: update Go to version 1.22 --- 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 ++-- Makefile | 2 +- README.md | 2 +- appveyor.yml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile.opencv b/Dockerfile.opencv index da88141b..55d29b4c 100644 --- 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 index 5d298af4..591f3a40 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.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 index 78057a93..15416389 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.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 index cd47d18b..6d0bf738 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.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 index 701227ac..c8e25fcc 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.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 index d0aedd5c..f5095ec8 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.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 index b2db702e..27a3355f 100644 --- 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 index 161cbb97..8ae6c2e0 100644 --- 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 index 034ffd89..41c91bf8 100644 --- 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 index 8af38ef2..fc7476bb 100644 --- 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