Skip to content

Commit

Permalink
all: update Go to version 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
mmichal9 committed Feb 9, 2024
1 parent bf0a85d commit 7db1370
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.opencv
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.opencv-gpu-cuda-10
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.opencv-gpu-cuda-11
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.opencv-gpu-cuda-11.2.2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.opencv-gpu-cuda-12
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.opencv-openvino
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.opencv-static
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7db1370

Please sign in to comment.