Skip to content

Commit d892ddc

Browse files
behzad-mirCopilot
andauthored
fix: migrate runtime base images from distroless/minimal to distroless/base (#4369)
Go 1.26 enforces FIPS-compliant system crypto, which requires crypto libraries to be present at runtime. distroless/minimal lacks these libraries and will cause pod startup failures. This change migrates all runtime base images to distroless/base:3.0, which includes the required crypto libraries while remaining minimal. Changes: - build/images.mk: MARINER_DISTROLESS_IMG minimal → base - bpf-prog/ipv6-hp-bpf/linux.Dockerfile: cbl-mariner/distroless/minimal:2.0 → azurelinux/distroless/base:3.0 - .pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile: minimal → base - Regenerated all template Dockerfiles via make dockerfiles Resolves #4364 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 3b7a9c0 commit d892ddc

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ARG ARCH
55
# mcr.microsoft.com/azurelinux/base/core:3.0
66
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
77

8-
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
9-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS mariner-distroless
8+
# mcr.microsoft.com/azurelinux/distroless/base:3.0
9+
FROM mcr.microsoft.com/azurelinux/distroless/base@sha256:32820d2cf20e896aa9111742dd683dd0ccff370f742e256889bb3bb50320c0d4 AS mariner-distroless
1010

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

.pipelines/build/dockerfiles/cns.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ EXPOSE 10090
1414
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS build-helper
1515
RUN tdnf install -y iptables
1616

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

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

.pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG ARCH
22

33

4-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal:3.0 AS linux
4+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0 AS linux
55
ARG ARTIFACT_DIR
66
COPY ${ARTIFACT_DIR}/lib/* /lib
77
COPY ${ARTIFACT_DIR}/bin/ipv6-hp-bpf /ipv6-hp-bpf

azure-iptables-monitor/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ARG ARCH
55
# mcr.microsoft.com/azurelinux/base/core:3.0
66
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
77

8-
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
9-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS mariner-distroless
8+
# mcr.microsoft.com/azurelinux/distroless/base:3.0
9+
FROM mcr.microsoft.com/azurelinux/distroless/base@sha256:32820d2cf20e896aa9111742dd683dd0ccff370f742e256889bb3bb50320c0d4 AS mariner-distroless
1010

1111
# mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
1212
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc7423b52b62e8f0281b5f7f564eb1862dc315bc57e1373c6a81e87ef3ac39ab AS go

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN if [ "$DEBUG" = "true" ]; then echo "\n#define DEBUG" >> /bpf-prog/ipv6-hp-b
3939
RUN GOOS=$OS CGO_ENABLED=0 go generate ./...
4040
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/ipv6-hp-bpf -trimpath -ldflags "-s -w -X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
4141

42-
FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
42+
FROM mcr.microsoft.com/azurelinux/distroless/base:3.0 AS linux
4343
COPY --from=go /go/bin/ipv6-hp-bpf /ipv6-hp-bpf
4444
COPY --from=go /usr/sbin/nft /usr/sbin/nft
4545
COPY --from=go /sbin/ip /sbin/ip

build/images.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Source images
22
export GO_IMG ?= mcr.microsoft.com/oss/go/microsoft/golang:1.24-azurelinux3.0
33
export MARINER_CORE_IMG ?= mcr.microsoft.com/azurelinux/base/core:3.0
4-
export MARINER_DISTROLESS_IMG ?= mcr.microsoft.com/azurelinux/distroless/minimal:3.0
4+
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
66

77

cns/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:b
1010
# mcr.microsoft.com/azurelinux/base/core:3.0
1111
FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
1212

13-
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
14-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:5a66f9f16ac675db2a8229dac72d83811b73b502d6ad192d8b374c7f3be498af AS mariner-distroless
13+
# mcr.microsoft.com/azurelinux/distroless/base:3.0
14+
FROM mcr.microsoft.com/azurelinux/distroless/base@sha256:32820d2cf20e896aa9111742dd683dd0ccff370f742e256889bb3bb50320c0d4 AS mariner-distroless
1515

1616
FROM --platform=linux/${ARCH} go AS builder
1717
ARG OS

0 commit comments

Comments
 (0)