Skip to content

Commit 9e72c6e

Browse files
timraymondtimraymond
committed
Bump Go image to 1.25 and regenerate Dockerfiles
Update GO_IMG in build/images.mk from 1.24 to 1.25 and regenerate all Dockerfiles via make dockerfiles. As pointed out by @nairashu, the Dockerfiles are autogenerated from templates and should not be edited directly. This replaces the manual Dockerfile edit with proper template-based rendering.
1 parent e9d5b0f commit 9e72c6e

11 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎.pipelines/build/dockerfiles/azure-ipam.Dockerfile‎

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

55

6-
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
7-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
6+
# <no value>
7+
FROM --platform=windows/${ARCH} <no value> as windows
88
ARG ARTIFACT_DIR .
99

1010
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe

‎.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile‎

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

55
# mcr.microsoft.com/azurelinux/base/core:3.0
6-
FROM mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core
6+
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
77

88
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
9-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:22810fd97d6ad5ec7d5bdd5b00233a3050be01d9e26b47b16cb6f1a7f178834b AS mariner-distroless
9+
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS mariner-distroless
1010

1111
FROM mariner-core AS iptools
1212
RUN tdnf install -y iptables iproute

‎.pipelines/build/dockerfiles/cni.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# SOURCE: .pipelines/build/dockerfiles/cni.Dockerfile.tmpl
33
ARG ARCH
44

5-
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
6-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
5+
# <no value>
6+
FROM --platform=windows/${ARCH} <no value> AS windows
77
ARG ARTIFACT_DIR .
88

99
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe

‎.pipelines/build/dockerfiles/cns.Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# SOURCE: .pipelines/build/dockerfiles/cns.Dockerfile.tmpl
33
ARG ARCH
44

5-
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
6-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
5+
# <no value>
6+
FROM --platform=windows/${ARCH} <no value> AS windows
77
ARG ARTIFACT_DIR .
88

99
COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
1010
ENTRYPOINT ["azure-cns.exe"]
1111
EXPOSE 10090
1212

1313
# mcr.microsoft.com/azurelinux/base/core:3.0
14-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS build-helper
14+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS build-helper
1515
RUN tdnf install -y iptables
1616

1717
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
18-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:22810fd97d6ad5ec7d5bdd5b00233a3050be01d9e26b47b16cb6f1a7f178834b AS linux
18+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS linux
1919
ARG ARTIFACT_DIR .
2020

2121
COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/

‎azure-ip-masq-merger/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
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.25-azurelinux3.0
7+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3efee8683ba87f9b3e0155cd932f9b79b16354e11410bffaa91a974ad13b9954 AS go
8+
ENV GOEXPERIMENT=nosystemcrypto
89

910
FROM go AS azure-ip-masq-merger
1011
ARG OS

‎azure-ipam/Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ 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.25-azurelinux3.0
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3efee8683ba87f9b3e0155cd932f9b79b16354e11410bffaa91a974ad13b9954 AS go
10+
ENV GOEXPERIMENT=nosystemcrypto
1011

1112
# mcr.microsoft.com/azurelinux/base/core:3.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core
13+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
1314

1415
FROM go AS azure-ipam
1516
ARG OS
@@ -39,8 +40,8 @@ FROM scratch AS linux
3940
COPY --from=dropgz /go/bin/dropgz dropgz
4041
ENTRYPOINT [ "/dropgz" ]
4142

42-
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
43-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS hpc
43+
# <no value>
44+
FROM --platform=windows/${ARCH} <no value> AS hpc
4445
FROM hpc AS windows
4546
COPY --from=dropgz /go/bin/dropgz dropgz.exe
4647
ENTRYPOINT [ "/dropgz.exe" ]

‎azure-iptables-monitor/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
ARG ARCH
44

55
# mcr.microsoft.com/azurelinux/base/core:3.0
6-
FROM mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core
6+
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
77

88
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
9-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:22810fd97d6ad5ec7d5bdd5b00233a3050be01d9e26b47b16cb6f1a7f178834b AS mariner-distroless
9+
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS mariner-distroless
1010

1111
# mcr.microsoft.com/oss/go/microsoft/golang:1.25-azurelinux3.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:8eb433398e85315f79fd5ad1bcf791a67519c2ce0277b627e244374d513a94e6 AS go
12+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3efee8683ba87f9b3e0155cd932f9b79b16354e11410bffaa91a974ad13b9954 AS go
13+
ENV GOEXPERIMENT=nosystemcrypto
1314

1415

1516
FROM go AS azure-iptables-monitor

‎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.25-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/minimal: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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
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.25-azurelinux3.0
7+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3efee8683ba87f9b3e0155cd932f9b79b16354e11410bffaa91a974ad13b9954 AS go
8+
ENV GOEXPERIMENT=nosystemcrypto
89

910
FROM go AS fluent-bit-plugin
1011
ARG VERSION

‎cni/Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ 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.25-azurelinux3.0
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3efee8683ba87f9b3e0155cd932f9b79b16354e11410bffaa91a974ad13b9954 AS go
10+
ENV GOEXPERIMENT=nosystemcrypto
1011

1112
# mcr.microsoft.com/azurelinux/base/core:3.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core
13+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
1314

1415
FROM go AS azure-vnet
1516
ARG OS
@@ -54,8 +55,8 @@ FROM scratch AS linux
5455
COPY --from=dropgz /go/bin/dropgz dropgz
5556
ENTRYPOINT [ "/dropgz" ]
5657

57-
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
58-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as hpc
58+
# <no value>
59+
FROM --platform=windows/${ARCH} <no value> as hpc
5960

6061
FROM hpc as windows
6162
COPY --from=dropgz /go/bin/dropgz dropgz.exe

0 commit comments

Comments
 (0)