Skip to content

Commit

Permalink
docker: update container images to Go 1.21
Browse files Browse the repository at this point in the history
Signed-off-by: deadprogram <[email protected]>
  • Loading branch information
deadprogram committed Aug 14, 2023
1 parent 8f9b467 commit e15d3ea
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 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.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 \
Expand Down Expand Up @@ -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 \
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.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
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.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
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.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
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.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
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.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
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.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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit e15d3ea

Please sign in to comment.