Skip to content

Commit c17d5ea

Browse files
jimassajimassa
authored
fix(version-upgrade): Update go std lib from v1.23.4 -> 1.23.5 (#1289)
# Description Please provide a brief description of the changes made in this pull request. Upgrade go stdlib version to fix vulnerabilities. ## 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 - [x] I have read the [contributing documentation](https://retina.sh/docs/contributing). - [x] 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. - [x] I have correctly attributed the author(s) of the code. - [x] I have tested the changes locally. - [x] I have followed the project's style guidelines. - [x] I have updated the documentation, if necessary. - [x] I have added tests, if applicable. ## Screenshots (if applicable) or Testing Completed CVE no longer present, only from hubble. ![image](https://github.com/user-attachments/assets/74117803-5180-421d-9a7a-6ea1c215804e) 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.
1 parent ae716a5 commit c17d5ea

11 files changed

+22
-22
lines changed

‎cli/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
33

44

55
ARG VERSION

‎controller/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ARG OS_VERSION
22

33
# pinned base images
44

5-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
6-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS golang
5+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
6+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS golang
77

88
# mcr.microsoft.com/cbl-mariner/base/core:2.0
99
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/cbl-mariner/base/core@sha256:77651116f2e83cf50fddd8a0316945499f8ce6521ff8e94e67539180d1e5975a AS mariner-core

‎controller/Dockerfile.gogen

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d
33

44

55
# Default linux/architecture.

‎controller/Dockerfile.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d
33

44
LABEL Name=retina-builder Version=0.0.1
55

‎controller/Dockerfile.windows-2022

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
33

44
# Build args
55
ARG VERSION

‎controller/Dockerfile.windows-cgo

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-windowsservercore-ltsc2022
2-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:e423369b45d4144324e61d6d64ce7a6d0e2bdf7f181c74d8ed25346891b8aacd AS cgo
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-windowsservercore-ltsc2022
2+
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:f88b5ef1afd628c18196e98c3d1c6081617768f4ad316433dd29b19a257a46eb AS cgo
33

44
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
55

‎controller/Dockerfile.windows-native

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# buildx targets, and this one requires legacy build.
44
# Maybe one day: https://github.com/moby/buildkit/issues/616
55
ARG BUILDER_IMAGE
6-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-windowsservercore-ltsc2022
7-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:e423369b45d4144324e61d6d64ce7a6d0e2bdf7f181c74d8ed25346891b8aacd AS builder
6+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-windowsservercore-ltsc2022
7+
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:f88b5ef1afd628c18196e98c3d1c6081617768f4ad316433dd29b19a257a46eb AS builder
88
WORKDIR C:\\retina
99
COPY go.mod .
1010
COPY go.sum .

‎operator/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
33

44
ARG VERSION
55
ARG APP_INSIGHTS_ID

‎operator/Dockerfile.windows-2019

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
33

44
# Build args
55
ARG VERSION

‎operator/Dockerfile.windows-2022

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
1+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
33

44
# Build args
55
ARG VERSION

‎test/image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# build stage
2-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.4-cbl-mariner2.0
3-
FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:88225e171f29fe5f1f6ffca8eb659535b19b253354e43e1f4fc8a9bc67615ca1 AS builder
2+
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-cbl-mariner2.0
3+
FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:ef39e430a97a61bec3395adb673a7c5611d2212f14abe40da21cbfd11a9d6e9d AS builder
44
ENV CGO_ENABLED=0
55
COPY . /go/src/github.com/microsoft/retina
66
WORKDIR /go/src/github.com/microsoft/retina

0 commit comments

Comments
 (0)