Skip to content

Commit 2b164ef

Browse files
behzad-mirCopilot
andcommitted
fix: bump Go version to 1.26
Upgrade Go toolchain from 1.24 to 1.26 across all build configurations. Go 1.26 enforces FIPS-compliant system crypto for Microsoft compliance. Changes: - build/images.mk: GO_IMG 1.24 → 1.26-azurelinux3.0 - go.mod: go 1.24.1 → go 1.26 - install-go.sh: DEFAULT_IMAGE updated to Go 1.26 azurelinux3.0 SHA - bpf-prog/ipv6-hp-bpf/linux.Dockerfile: updated to Go 1.26 MCR SHA - npm/linux.Dockerfile, npm/windows.Dockerfile: 1.25.5 → 1.26 - .devcontainer/Dockerfile: VARIANT 1.24 → 1.26 - Regenerated all template Dockerfiles via make dockerfiles SHAs: - azurelinux3.0: sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 - MCR golang:1.26: sha256:6c27ae470941ef215b3eea86fcd6632a7ab975f391e5a75f546d3a76fd686705 Resolves #4365 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent d5e33a7 commit 2b164ef

13 files changed

Lines changed: 20 additions & 20 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT="1.24"
1+
ARG VARIANT="1.26"
22
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
33
RUN apt-get update && \
44
export DEBIAN_FRONTEND=noninteractive && \

.pipelines/build/scripts/install-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -eux
1212
#
1313
# To update the fallback, run:
1414
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
15-
DEFAULT_IMAGE="mcr.microsoft.com/oss/go/microsoft/golang@sha256:3999f970bb52b7413ef9be2803173d4fd7f1f3c59362a98a0c78d155e3a0e59f"
15+
DEFAULT_IMAGE="mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9"
1616

1717
# Resolves the golang image from the source Dockerfile for the given $name.
1818
# Echoes the image reference, or empty string if it cannot be determined.

azure-ip-masq-merger/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
ARG ARCH
44
ARG OS
55

6-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
7-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
6+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
7+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
88

99
FROM go AS azure-ip-masq-merger
1010
ARG OS

azure-ipam/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ARG DROPGZ_VERSION=v0.0.12
55
ARG OS_VERSION
66
ARG OS
77

8-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
9-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
8+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
1010

1111
# mcr.microsoft.com/azurelinux/base/core:3.0
1212
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core

azure-iptables-monitor/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a33
88
# mcr.microsoft.com/azurelinux/distroless/base:3.0
99
FROM mcr.microsoft.com/azurelinux/distroless/base@sha256:32820d2cf20e896aa9111742dd683dd0ccff370f742e256889bb3bb50320c0d4 AS mariner-distroless
1010

11-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
11+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
12+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
1313

1414

1515
FROM go AS azure-iptables-monitor

bpf-prog/ipv6-hp-bpf/linux.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ARCH
2-
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.24 --format "{{.Name}}@{{.Digest}}"
3-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:f3e556c9de4dd93be774dc0fa2ce3cfa76f7744d0bacada92d1624f04ce69461 AS go
2+
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26 --format "{{.Name}}@{{.Digest}}"
3+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:6c27ae470941ef215b3eea86fcd6632a7ab975f391e5a75f546d3a76fd686705 AS go
44
ARG VERSION
55
ARG DEBUG
66
ARG OS

build/images.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Source images
2-
export GO_IMG ?= mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
2+
export GO_IMG ?= mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
33
export MARINER_CORE_IMG ?= mcr.microsoft.com/azurelinux/base/core:3.0
44
export MARINER_DISTROLESS_IMG ?= mcr.microsoft.com/azurelinux/distroless/base:3.0
55
export WIN_HPC_IMG ?= mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0

cilium-log-collector/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
ARG ARCH
44
ARG OS
55

6-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
7-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
6+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
7+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
88

99
FROM go AS fluent-bit-plugin
1010
ARG VERSION

cni/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ARG DROPGZ_VERSION=v0.0.12
55
ARG OS_VERSION
66
ARG OS
77

8-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
9-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
8+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
1010

1111
# mcr.microsoft.com/azurelinux/base/core:3.0
1212
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core

cns/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ARG ARCH
44
ARG OS_VERSION
55
ARG OS
66

7-
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
8-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go
7+
# mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
8+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
99

1010
# mcr.microsoft.com/azurelinux/base/core:3.0
1111
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core

0 commit comments

Comments
 (0)