docker: update container images to Go 1.21

Signed-off-by: deadprogram <[email protected]>
hybridgroup · Aug 16, 2023 · 2b32c1b · 2b32c1b
1 parent 8f9b467
commit 2b32c1b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -45,7 +45,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv
  platforms: linux/amd64,linux/arm64
@@ -95,7 +95,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-static
  platforms: linux/amd64,linux/arm64
@@ -141,7 +141,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-gpu-cuda-11
  platforms: linux/amd64
@@ -187,7 +187,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-gpu-cuda-11.2.2
  platforms: linux/amd64
@@ -233,7 +233,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-gpu-cuda-12
  platforms: linux/amd64
@@ -279,7 +279,7 @@ jobs:
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-ubuntu-18.04
  platforms: linux/amd64
@@ -325,7 +325,7 @@ jobs:
  username: ${{ github.repository_owner }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-ubuntu-20.04
  platforms: linux/amd64
@@ -371,7 +371,7 @@ jobs:
  username: ${{ github.repository_owner }}
  password: ${{ secrets.GITHUB_TOKEN }}
  - name: Build and push
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v4.1.1
  with:
  file: Dockerfile.opencv-ubuntu-22.04
  platforms: linux/amd64

diff --git a/Dockerfile.opencv b/Dockerfile.opencv
@@ -11,7 +11,7 @@
 # amd64 build stage
 ###################
 
-FROM --platform=linux/amd64 golang:1.20-buster AS opencv-base-amd64
+FROM --platform=linux/amd64 golang:1.21-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.20-buster AS opencv-base-arm64
+FROM --platform=linux/arm64 golang:1.21-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.20.2
+ENV GO_RELEASE=1.21.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.20.6
+ENV GO_RELEASE=1.21.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.20.6
+ENV GO_RELEASE=1.21.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.20.6
+ENV GO_RELEASE=1.21.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.20.2
+ENV GO_RELEASE=1.21.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.20-buster AS opencv-base-amd64
+FROM --platform=linux/amd64 golang:1.21-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.20-buster AS opencv-base-arm64
+FROM --platform=linux/arm64 golang:1.21-bullseye AS opencv-base-arm64
 LABEL maintainer="hybridgroup"
 
 RUN apt-get update && apt-get install -y --no-install-recommends \