Skip to content

Commit f2fb6f0

Browse files
SRodiSRodi
authored
chore(go): update go.mod and base images to go 1.23.4 (#1127)
# Description * Update go version in go.mod to 1.23.4 * Update build images to 1.23.4 ## Related Issue n/a ## 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 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 1566b98 commit f2fb6f0

13 files changed

+25
-31
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.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:8ac5373de7fde69d08c52e4a1ba40e976a543b3e93196f7fe07c3f91853865f3 AS builder
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
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.1-cbl-mariner2.0
6-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:8ac5373de7fde69d08c52e4a1ba40e976a543b3e93196f7fe07c3f91853865f3 AS golang
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
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.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef
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
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.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef
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
33

44
LABEL Name=retina-builder Version=0.0.1
55

‎controller/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.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef AS builder
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
33

44
# Build args
55
ARG VERSION

‎controller/Dockerfile.windows-2022

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef AS builder
3-
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
43

54
# Build args
65
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.1-windowsservercore-ltsc2022
2-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:e2d55093522b5f4a311494255d0598145b1f13da5ae2354a09c7f7c1355f3ad9 AS cgo
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
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.1-windowsservercore-ltsc2022
7-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang@sha256:e2d55093522b5f4a311494255d0598145b1f13da5ae2354a09c7f7c1355f3ad9 AS builder
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
88
WORKDIR C:\\retina
99
COPY go.mod .
1010
COPY go.sum .

‎go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/microsoft/retina
22

3-
go 1.22.7
4-
5-
toolchain go1.23.1
3+
go 1.23.4
64

75
require (
86
github.com/go-chi/chi/v5 v5.1.0

‎operator/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:8ac5373de7fde69d08c52e4a1ba40e976a543b3e93196f7fe07c3f91853865f3 AS builder
3-
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
43

54
ARG VERSION
65
ARG APP_INSIGHTS_ID

‎operator/Dockerfile.windows-2019

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef AS builder
3-
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
43

54
# Build args
65
ARG VERSION

‎operator/Dockerfile.windows-2022

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-cbl-mariner2.0
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef AS builder
3-
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
43

54
# Build args
65
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.1-cbl-mariner2.0
3-
FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:dcd95cadab21a855894c599c9e26bfb2179aa08e7d7f99c0e8546167712ba6ef AS builder
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
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)