From aa3bc5df4e4c97f91ff56ba8b2a460d9dabeef2d Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Tue, 2 Jun 2026 20:35:43 -0500 Subject: [PATCH] chore(images): re-render Dockerfiles Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../dockerfiles/azure-iptables-monitor.Dockerfile | 14 ++++++++------ .pipelines/build/dockerfiles/cns.Dockerfile | 4 ++-- azure-ipam/Dockerfile | 2 +- azure-iptables-monitor/Dockerfile | 14 ++++++++------ cni/Dockerfile | 4 ++-- cns/Dockerfile | 6 +++--- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile b/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile index b54ff0e6b8..11779c7cd3 100644 --- a/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile +++ b/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile @@ -3,18 +3,20 @@ ARG ARCH # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS mariner-core # mcr.microsoft.com/azurelinux/distroless/minimal:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:22810fd97d6ad5ec7d5bdd5b00233a3050be01d9e26b47b16cb6f1a7f178834b AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0c64ab9cfc44d4f100c0590bd59ead9afedda6cc54f14bb7465b5f9c35ddc037 AS mariner-distroless -FROM mariner-core AS iptables -RUN tdnf install -y iptables +FROM mariner-core AS iptools +RUN tdnf install -y iptables iproute FROM mariner-distroless AS linux ARG ARTIFACT_DIR -COPY --from=iptables /usr/sbin/*tables* /usr/sbin/ -COPY --from=iptables /usr/lib /usr/lib +COPY --from=iptools /usr/sbin/*tables* /usr/sbin/ +COPY --from=iptools /usr/sbin/ip /usr/sbin/ +COPY --from=iptools /usr/lib /usr/lib +COPY --from=iptools /usr/lib64 /usr/lib64 COPY ${ARTIFACT_DIR}/bin/azure-iptables-monitor /azure-iptables-monitor COPY ${ARTIFACT_DIR}/bin/azure-block-iptables /azure-block-iptables diff --git a/.pipelines/build/dockerfiles/cns.Dockerfile b/.pipelines/build/dockerfiles/cns.Dockerfile index cfbe2a1155..b872c5caf2 100644 --- a/.pipelines/build/dockerfiles/cns.Dockerfile +++ b/.pipelines/build/dockerfiles/cns.Dockerfile @@ -11,11 +11,11 @@ ENTRYPOINT ["azure-cns.exe"] EXPOSE 10090 # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:94ad614201891509f6680b8d392f519df0274460417dfe6662643800822e380d AS build-helper +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS build-helper RUN tdnf install -y iptables # mcr.microsoft.com/azurelinux/distroless/minimal:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:138fe2905465e384b232ffe8ba3147de04c633a83f29d8df00d6817e3eacb0d2 AS linux +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0c64ab9cfc44d4f100c0590bd59ead9afedda6cc54f14bb7465b5f9c35ddc037 AS linux ARG ARTIFACT_DIR . COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/ diff --git a/azure-ipam/Dockerfile b/azure-ipam/Dockerfile index 589945f681..1e9549a523 100644 --- a/azure-ipam/Dockerfile +++ b/azure-ipam/Dockerfile @@ -9,7 +9,7 @@ ARG OS FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS mariner-core FROM go AS azure-ipam ARG OS diff --git a/azure-iptables-monitor/Dockerfile b/azure-iptables-monitor/Dockerfile index 7e067faf75..5d30529d37 100644 --- a/azure-iptables-monitor/Dockerfile +++ b/azure-iptables-monitor/Dockerfile @@ -3,10 +3,10 @@ ARG ARCH # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core@sha256:a452d39c91576f5a2c983c7d3b62521fabd08e16b4a7237e24bf2be3b06e1651 AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS mariner-core # mcr.microsoft.com/azurelinux/distroless/minimal:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:22810fd97d6ad5ec7d5bdd5b00233a3050be01d9e26b47b16cb6f1a7f178834b AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0c64ab9cfc44d4f100c0590bd59ead9afedda6cc54f14bb7465b5f9c35ddc037 AS mariner-distroless # mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go @@ -48,12 +48,14 @@ RUN if [ "$ARCH" = "amd64" ]; then \ RUN GOOS=$OS CGO_ENABLED=0 go generate ./bpf-prog/azure-block-iptables/... RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-block-iptables -trimpath -ldflags "-s -w -X main.version="$AZURE_BLOCK_IPTABLES_VERSION"" -gcflags="-dwarflocationlists=true" ./bpf-prog/azure-block-iptables/cmd/azure-block-iptables -FROM mariner-core AS iptables -RUN tdnf install -y iptables +FROM mariner-core AS iptools +RUN tdnf install -y iptables iproute FROM mariner-distroless AS linux -COPY --from=iptables /usr/sbin/*tables* /usr/sbin/ -COPY --from=iptables /usr/lib /usr/lib +COPY --from=iptools /usr/sbin/*tables* /usr/sbin/ +COPY --from=iptools /usr/sbin/ip /usr/sbin/ +COPY --from=iptools /usr/lib /usr/lib +COPY --from=iptools /usr/lib64 /usr/lib64 COPY --from=azure-iptables-monitor /go/bin/iptables-monitor azure-iptables-monitor COPY --from=azure-block-iptables /go/bin/azure-block-iptables azure-block-iptables diff --git a/cni/Dockerfile b/cni/Dockerfile index 7be9340c94..661b207d30 100644 --- a/cni/Dockerfile +++ b/cni/Dockerfile @@ -6,10 +6,10 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:269dfe0b7256dc91926ade7a3a2c30556648c41f23a1fee0c363520488e8e2f0 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:94ad614201891509f6680b8d392f519df0274460417dfe6662643800822e380d AS mariner-core +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS mariner-core FROM go AS azure-vnet ARG OS diff --git a/cns/Dockerfile b/cns/Dockerfile index 20f1aa04df..643485b4ec 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -5,13 +5,13 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:269dfe0b7256dc91926ade7a3a2c30556648c41f23a1fee0c363520488e8e2f0 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core@sha256:94ad614201891509f6680b8d392f519df0274460417dfe6662643800822e380d AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS mariner-core # mcr.microsoft.com/azurelinux/distroless/minimal:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:138fe2905465e384b232ffe8ba3147de04c633a83f29d8df00d6817e3eacb0d2 AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0c64ab9cfc44d4f100c0590bd59ead9afedda6cc54f14bb7465b5f9c35ddc037 AS mariner-distroless FROM --platform=linux/${ARCH} go AS builder ARG OS