From 71e2dfe7d0ad0be7acb19f4ee10639f4322dbff3 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Tue, 20 Aug 2024 23:59:08 -0400 Subject: [PATCH] chore: update Go image used in Dockerfiles to 1.22.4 (#626) # Description As title ## Related Issue If this pull request is related to any issue, please mention it here. Additionally, make sure that the issue is assigned to you before submitting this pull request. ## Checklist - [ ] I have read the [contributing documentation](https://retina.sh/docs/contributing). - [ ] I signed and signed-off the commits (`git commit -S -s ...`). See [this documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) on signing commits. - [ ] I have correctly attributed the author(s) of the code. - [ ] I have tested the changes locally. - [ ] I have followed the project's style guidelines. - [ ] I have updated the documentation, if necessary. - [ ] I have added tests, if applicable. ## Screenshots (if applicable) or Testing Completed Please add any relevant screenshots or GIFs to showcase the changes made. ## Additional Notes Add any additional notes or context about the pull request here. --- Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more information on how to contribute to this project. --- controller/Dockerfile | 4 ++-- controller/Dockerfile.gogen | 4 +++- controller/Dockerfile.proto | 4 +++- controller/Dockerfile.windows-2019 | 4 +++- controller/Dockerfile.windows-2022 | 4 +++- controller/Dockerfile.windows-cgo | 3 ++- controller/Dockerfile.windows-native | 3 ++- go.mod | 2 +- operator/Dockerfile | 4 +++- operator/Dockerfile.windows-2019 | 4 +++- operator/Dockerfile.windows-2022 | 4 +++- test/image/Dockerfile | 3 ++- 12 files changed, 30 insertions(+), 13 deletions(-) diff --git a/controller/Dockerfile b/controller/Dockerfile index 853ddf0a01..662aa5e2cc 100644 --- a/controller/Dockerfile +++ b/controller/Dockerfile @@ -2,8 +2,8 @@ ARG OS_VERSION # pinned base images -# mcr.microsoft.com/oss/go/microsoft/golang:1.22.3-1-cbl-mariner2.0 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:8253def0216b87b2994b7ad689aeec7440f6eb67f981e438071d8d67e36ff69f AS golang +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS golang # mcr.microsoft.com/cbl-mariner/base/core:2.0 FROM --platform=$TARGETPLATFORM mcr.microsoft.com/cbl-mariner/base/core@sha256:77651116f2e83cf50fddd8a0316945499f8ce6521ff8e94e67539180d1e5975a AS mariner-core diff --git a/controller/Dockerfile.gogen b/controller/Dockerfile.gogen index c832afe2aa..a8dff656b4 100644 --- a/controller/Dockerfile.gogen +++ b/controller/Dockerfile.gogen @@ -1,4 +1,6 @@ -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 as gogen-tools +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 + # Default linux/architecture. ARG GOOS=linux diff --git a/controller/Dockerfile.proto b/controller/Dockerfile.proto index d13a42c222..ada8ea3380 100644 --- a/controller/Dockerfile.proto +++ b/controller/Dockerfile.proto @@ -1,4 +1,6 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS proto-tools +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 + LABEL Name=retina-builder Version=0.0.1 RUN apt-get update &&\ diff --git a/controller/Dockerfile.windows-2019 b/controller/Dockerfile.windows-2019 index b2385c38bd..b598ed2845 100644 --- a/controller/Dockerfile.windows-2019 +++ b/controller/Dockerfile.windows-2019 @@ -1,4 +1,6 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder + # Build args ARG VERSION ARG APP_INSIGHTS_ID diff --git a/controller/Dockerfile.windows-2022 b/controller/Dockerfile.windows-2022 index 7a9ef50ff5..3ac86c43cc 100644 --- a/controller/Dockerfile.windows-2022 +++ b/controller/Dockerfile.windows-2022 @@ -1,4 +1,6 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder + # Build args ARG VERSION diff --git a/controller/Dockerfile.windows-cgo b/controller/Dockerfile.windows-cgo index e86a984e94..91b21f72bf 100644 --- a/controller/Dockerfile.windows-cgo +++ b/controller/Dockerfile.windows-cgo @@ -1,4 +1,5 @@ -FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22.2-windowsservercore-ltsc2022 AS cgo +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-windowsservercore-ltsc2022 +FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:c2548f33fe6e8d0663660cfb5279706288aa7a9f65df0029abb690e575126a25 AS cgo SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/controller/Dockerfile.windows-native b/controller/Dockerfile.windows-native index df5c2fced9..3d5b41f105 100644 --- a/controller/Dockerfile.windows-native +++ b/controller/Dockerfile.windows-native @@ -3,7 +3,8 @@ # buildx targets, and this one requires legacy build. # Maybe one day: https://github.com/moby/buildkit/issues/616 ARG BUILDER_IMAGE -FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22-windowsservercore-ltsc2022 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-windowsservercore-ltsc2022 +FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:c2548f33fe6e8d0663660cfb5279706288aa7a9f65df0029abb690e575126a25 AS builder WORKDIR C:\\retina COPY go.mod . COPY go.sum . diff --git a/go.mod b/go.mod index 707a5b0515..2a3a65f39c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/microsoft/retina -go 1.22.3 +go 1.22.4 require ( github.com/go-chi/chi/v5 v5.1.0 diff --git a/operator/Dockerfile b/operator/Dockerfile index 1aa9477f4c..2718e9b9fe 100644 --- a/operator/Dockerfile +++ b/operator/Dockerfile @@ -1,4 +1,6 @@ -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder + ARG VERSION ARG APP_INSIGHTS_ID diff --git a/operator/Dockerfile.windows-2019 b/operator/Dockerfile.windows-2019 index d097abf015..f879475a58 100644 --- a/operator/Dockerfile.windows-2019 +++ b/operator/Dockerfile.windows-2019 @@ -1,4 +1,6 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder + # Build args ARG VERSION diff --git a/operator/Dockerfile.windows-2022 b/operator/Dockerfile.windows-2022 index 4e5c215c2d..ce6ec8ef38 100644 --- a/operator/Dockerfile.windows-2022 +++ b/operator/Dockerfile.windows-2022 @@ -1,4 +1,6 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder + # Build args ARG VERSION diff --git a/test/image/Dockerfile b/test/image/Dockerfile index ca44c20315..d760a431e1 100644 --- a/test/image/Dockerfile +++ b/test/image/Dockerfile @@ -1,5 +1,6 @@ # build stage -FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:8253def0216b87b2994b7ad689aeec7440f6eb67f981e438071d8d67e36ff69f AS builder +# mcr.microsoft.com/oss/go/microsoft/golang:1.22.4-1-cbl-mariner2.0 +FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:62b5953c2bee60b39d2b0505fb073b1f06ec3aaec34e44e9807cb8af85f53622 AS builder ENV CGO_ENABLED=0 COPY . /go/src/github.com/microsoft/retina WORKDIR /go/src/github.com/microsoft/retina