diff --git a/.pipelines/build/dockerfiles/cilium-log-collector.Dockerfile b/.pipelines/build/dockerfiles/cilium-log-collector.Dockerfile index dfee5b5134..1e15c26dd1 100644 --- a/.pipelines/build/dockerfiles/cilium-log-collector.Dockerfile +++ b/.pipelines/build/dockerfiles/cilium-log-collector.Dockerfile @@ -2,6 +2,6 @@ # SOURCE: .pipelines/build/dockerfiles/cilium-log-collector.Dockerfile.tmpl ARG ARCH -FROM mcr.microsoft.com/oss/v2/fluent/fluent-bit:v4.2.3-16 as linux +FROM mcr.microsoft.com/oss/v2/fluent/fluent-bit:v4.2.3-18 as linux ARG ARTIFACT_DIR COPY ${ARTIFACT_DIR}/bin/out_azure_app_insights.so /out_azure_app_insights.so diff --git a/.pipelines/build/dockerfiles/npm.Dockerfile b/.pipelines/build/dockerfiles/npm.Dockerfile index c4f7956da9..2711eb3579 100644 --- a/.pipelines/build/dockerfiles/npm.Dockerfile +++ b/.pipelines/build/dockerfiles/npm.Dockerfile @@ -2,7 +2,7 @@ ARG ARCH # intermediate for win-ltsc2022 -FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/servercore:ltsc2022@sha256:3a2a2fdfbae2f720f6fe26f2d7680146712ce330f605b02a61d624889735c72e as windows +FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/servercore:ltsc2022@sha256:0df5b1c3394198525f426e379b61d8f09ce60cb449b1cb4cab163e965672cd67 as windows ARG ARTIFACT_DIR COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml diff --git a/azure-ip-masq-merger/Dockerfile b/azure-ip-masq-merger/Dockerfile index 317d984d86..9dcfcdd6e0 100644 --- a/azure-ip-masq-merger/Dockerfile +++ b/azure-ip-masq-merger/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go # mcr.microsoft.com/azurelinux/distroless/base:3.0 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless diff --git a/azure-ipam/Dockerfile b/azure-ipam/Dockerfile index 5cf791cee4..2da7f78bb9 100644 --- a/azure-ipam/Dockerfile +++ b/azure-ipam/Dockerfile @@ -6,7 +6,7 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go # mcr.microsoft.com/azurelinux/base/core:3.0 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core diff --git a/azure-iptables-monitor/Dockerfile b/azure-iptables-monitor/Dockerfile index 79522f4bb4..8a1ea3225f 100644 --- a/azure-iptables-monitor/Dockerfile +++ b/azure-iptables-monitor/Dockerfile @@ -9,7 +9,7 @@ FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go FROM go AS azure-iptables-monitor diff --git a/bpf-prog/ipv6-hp-bpf/linux.Dockerfile b/bpf-prog/ipv6-hp-bpf/linux.Dockerfile index d61357d9ab..e681191d2c 100644 --- a/bpf-prog/ipv6-hp-bpf/linux.Dockerfile +++ b/bpf-prog/ipv6-hp-bpf/linux.Dockerfile @@ -1,7 +1,7 @@ ARG ARCH # IMG=mcr.microsoft.com/oss/go/microsoft/golang:1.26.7 # echo "${IMG}@$(skopeo inspect docker://${IMG} --format '{{.Digest}}')" -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26.7@sha256:be14ce4ce048adf5584ce3a0919d21987284e2235b6e7e9bb0e6a01133870be9 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26.7@sha256:8b85ed584c52f5479e09ef59eb32a0c90265666a3aca44f303705bdeaf8a5ec7 AS go ARG VERSION ARG DEBUG ARG OS diff --git a/cilium-log-collector/Dockerfile b/cilium-log-collector/Dockerfile index 873b80ddb0..e7da6120b5 100644 --- a/cilium-log-collector/Dockerfile +++ b/cilium-log-collector/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go FROM go AS fluent-bit-plugin ARG VERSION @@ -13,5 +13,5 @@ WORKDIR /cilium-log-collector COPY ./cilium-log-collector . RUN go build -buildmode=c-shared -a -o out_azure_app_insights.so -trimpath -ldflags "-X main.version=$VERSION" -gcflags="-dwarflocationlists=true" . -FROM mcr.microsoft.com/oss/v2/fluent/fluent-bit:v4.2.3-16 as linux +FROM mcr.microsoft.com/oss/v2/fluent/fluent-bit:v4.2.3-18 as linux COPY --from=fluent-bit-plugin /cilium-log-collector/out_azure_app_insights.so /out_azure_app_insights.so diff --git a/cni/Dockerfile b/cni/Dockerfile index f373993bef..ce74ed7eb8 100644 --- a/cni/Dockerfile +++ b/cni/Dockerfile @@ -6,7 +6,7 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go # mcr.microsoft.com/azurelinux/base/core:3.0 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core diff --git a/cns/Dockerfile b/cns/Dockerfile index 5ec0fad02d..be419a6de4 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -5,7 +5,7 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:f71abd962461be0412f9b9f9659061f1a45c1767e55ce9a51a457097bf2335e9 AS go # mcr.microsoft.com/azurelinux/base/core:3.0 FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core