Diff AZL4.0 against AZL3.0 files

Author: akoeplinger

src/azurelinux/3.0/helix/Dockerfile

@@ -1,9 +1,7 @@
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 as venv
+FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS venv
 
-RUN tdnf install --refresh -y \
-    build-essential \
-    ca-certificates-microsoft \
-    gcc \
+RUN dnf install --refresh -y \
+    ca-certificates \
     iputils \
     python3 \
     python3-devel \
@@ -15,16 +13,14 @@ RUN python3 -m venv /venv && \
         pip install ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
-FROM mcr.microsoft.com/azurelinux/base/core:3.0
+FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
 
 # Install .NET and test dependencies
-RUN tdnf update -y && \
-    tdnf install --setopt tsflags=nodocs --refresh -y \
-        ca-certificates-microsoft \
+RUN dnf install --setopt tsflags=nodocs --refresh -y \
+        ca-certificates \
         icu \
         iputils \
-        libgcc-atomic \
-        libmsquic \
+        libatomic \
         llvm \
         python3 \
         python3-pip \
@@ -33,13 +29,22 @@ RUN tdnf update -y && \
         tar \
         tzdata \
         which \
-    && tdnf clean all
+    && dnf clean all
+
+# Install msquic from previous AZL realese until azurelinux-official-ms-oss is available
+COPY azl3-repomd.xml.key /tmp/azl3-repomd.xml.key
+
+RUN tdnf update -y && \
+    tdnf install numactl-libs libxdp libnl3 --setopt tsflags=nodocs --refresh -y \
+    && tdnf --repoid azl3 '--repofrompath=azl3,https://packages.microsoft.com/azurelinux/3.0/prod/ms-oss/$basearch' --setopt='azl3.gpgkey=file:///tmp/azl3-repomd.xml.key' --setopt=azl3.gpgcheck=1 --setopt=azl3.repo_gpgcheck=1 install -y libmsquic \
+    && tdnf clean all \
+    && rm -f /tmp/azl3-repomd.xml.key
 
 # create helixbot user and give rights to sudo without password
 RUN /usr/sbin/useradd -c '' --uid 1000 --shell /bin/bash --groups adm helixbot && \
     chmod 755 /root && \
     echo "helixbot ALL=(ALL)       NOPASSWD: ALL" > /etc/sudoers.d/helixbot && \
-    mkdir /home/helixbot/ && chown -R helixbot /home/helixbot/
+    mkdir -p /home/helixbot/ && chown -R helixbot /home/helixbot/
 
 USER helixbot
 

src/azurelinux/3.0/helix/azl3-repomd.xml.key

@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF5v2nQBCADD+o8FgJQUcV9QTgdOTrYo8VtwHNOtTI1WWki8cUx+pI+aarHo
+zYN3/QQj+a5lALWeWM/w+aT1q/xGBBkmr9Qo5xWaXeiKZaMVv3H+1HIOjVvrWOHX
+zm+FvONB2fwAOclq9p7YaMqWtn4GckxD2YXhkTW0Y4kM+TcMTgSCiGKskjnmTfHw
+G+SI9av/CZvqqfNZkdIuNTS9eSqTTenCKkgLvYRKSpkhZj1OuB/iTu+xK0BuoVns
+jmju/Fw+tBrcdu3Q1sRXDrh8lnZgHxQUxHjwnyMlTM8a9N2qCgnu+SQjNyk3NXgi
+dGSFkdtaF/Z+KNwG10XVs1jzjO/rtsrvrwJvABEBAAG0Ok1hcmluZXIgUlBNIFJl
+bGVhc2UgU2lnbmluZyA8bWFyaW5lcnJwbXByb2RAbWljcm9zb2Z0LmNvbT6JATgE
+EwEIACIFAl5v2nQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAzZ/tMx
+Nc6QfaMH/iqp4Uyd66rAC2tSILWrH6RLkf05TIE0GZheqQkEO7a/Khy3u/Ej/HgC
+QUlIC7yrJJGfNCyAx44Z/QsnrWz5EqVZOvjgY9MDpmzfve7KqmbnDBjmbSc6g8IH
+HcgUYyfTHEUj69IfgNyJK4Io1vi1WgY/sesAn2ZPpoeT3ihH5FqH7dQkGWeGg1bA
+FIaVXm+gMAssaj+k52g/+CnY4KZUHrSkg48OoRB+2a6FqGS8BLeCa+v+zaJCk2fz
+EI/NeJwL4Asz1F4AwkEu5X9y8eEGArCXoP0OpYpCxIBZ+7MiKKDOoNf0a/0nOhvs
+29LIIOnG+x0/RDfRgFObrF9geKpVTpI=
+=ZhFE
+-----END PGP PUBLIC KEY BLOCK-----

src/azurelinux/3.0/net11.0/android/amd64/Dockerfile

@@ -28,7 +28,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
 # Remove all components of NDK that are flagged by security scanners
 RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.11/site-packages/
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-llvm-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-llvm-amd64
 
 # Install Microsoft OpenJDK from the Microsoft OpenJDK 17 Mariner image.
 ENV LANG=en_US.UTF-8
@@ -41,8 +41,8 @@ ARG ANDROID_NDK_ROOT
 
 
 # Dependencies for Android build
-RUN tdnf update -y \
-    && tdnf install -y \
+RUN dnf update -y \
+    && dnf install -y \
         # Common dependencies
         binutils \
         # Android dependencies

src/azurelinux/3.0/net11.0/android/docker/amd64/Dockerfile

@@ -1,6 +1,6 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-android-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-android-amd64
 
-RUN tdnf update -y \
-    && tdnf install -y \
+RUN dnf update -y \
+    && dnf install -y \
         moby-engine \
-        moby-cli
+        docker-cli

src/azurelinux/3.0/net11.0/build/amd64/Dockerfile

@@ -1,19 +1,33 @@
-FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-azurelinux3.0
+FROM mcr.microsoft.com/dotnet/sdk:10.0-azurelinux3.0 AS powershell
+ENV POWERSHELL_VERSION=7.6.1
+RUN dotnet tool install --tool-path /powershell --version ${POWERSHELL_VERSION} PowerShell
 
-RUN tdnf update -y && \
-    tdnf install -y \
-        awk \
+FROM mcr.microsoft.com/dotnet/runtime:10.0-azurelinux3.0 AS runtime
+
+FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
+
+# Install .NET runtime dependencies (inlined from runtime-deps) and build tools
+RUN dnf update -y && \
+    dnf install -y \
+        gawk \
         azure-cli \
-        ca-certificates-microsoft \
+        ca-certificates \
         # added to ensure latest patches over the base image
         curl \
         git \
+        icu \
         nodejs24 \
         nodejs24-npm \
-        powershell \
         # provides 'useradd', required by Azure DevOps
         shadow-utils \
         tar \
         # Provides 'su', required by Azure DevOps
         util-linux \
-    && tdnf clean all
+    && dnf clean all
+
+COPY --from=runtime /usr/share/dotnet /usr/share/dotnet
+COPY --from=powershell /powershell /usr/share/powershell
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet && \
+    ln -s /usr/share/powershell/pwsh /usr/bin/pwsh && \
+    ln -sf /usr/bin/node-24 /usr/bin/node && \
+    ln -sf /usr/bin/npm-24 /usr/bin/npm

src/azurelinux/3.0/net11.0/cross/amd64-musl/Dockerfile

@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-builder-amd64 AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.17 --skipunmount --skipemulation
@@ -34,7 +34,7 @@ RUN TARGET_TRIPLE="x86_64-alpine-linux-musl" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-llvm-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

src/azurelinux/3.0/net11.0/cross/amd64-sanitizer/Dockerfile

@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-builder-amd64 AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # Use Ubuntu Bionic as the base image for the rootfs
@@ -35,7 +35,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
         -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$CPP_INCLUDES;$TRIPLET_INCLUDES" \
         -DCOMPILER_RT_CXX_LIBRARY="libcxx" \
         -DCOMPILER_RT_STATIC_CXX_LIBRARY=ON \
-        -DSANITIZER_CXX_ABI_LIBNAME="libstdc++" \ 
+        -DSANITIZER_CXX_ABI_LIBNAME="libstdc++" \
         -DCOMPILER_RT_BUILD_MEMPROF=OFF \
         # The libfuzzer build in LLVM doesn't correctly forward the required CMake properties to the "fuzzed libc++" build
         # so skip it here.
@@ -47,7 +47,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
     cmake --build runtimes -j && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-llvm-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang

src/azurelinux/3.0/net11.0/cross/amd64/Dockerfile

@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-builder-amd64 AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN PYTHON_EXECUTABLE="$ROOTFS_PIP_HOME/bin/python" /scripts/eng/common/cross/build-rootfs.sh x64 bionic --skipunmount --skipemulation
@@ -32,7 +32,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
         -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$CPP_INCLUDES;$TRIPLET_INCLUDES" \
         -DCOMPILER_RT_CXX_LIBRARY="libcxx" \
         -DCOMPILER_RT_STATIC_CXX_LIBRARY=ON \
-        -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ 
+        -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
         -DCOMPILER_RT_BUILD_MEMPROF=OFF \
         # The libfuzzer build in LLVM doesn't correctly forward the required CMake properties to the "fuzzed libc++" build
         # so skip it here.
@@ -42,7 +42,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-crossdeps-llvm-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/

src/azurelinux/3.0/net11.0/cross/android/amd64/Dockerfile

@@ -1,6 +1,6 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-amd64 AS crossrootx64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64 AS crossrootx64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-android-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-android-amd64
 
 # Copy crossrootfs from AMD64 build image, so we can build Android-targeting code for that arch
 COPY --from=crossrootx64 /crossrootfs/x64 /crossrootfs/x64

src/azurelinux/3.0/net11.0/cross/android/openssl/amd64/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-android-amd64
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-android-amd64
 
 # Copy the OpenSSL headers and libs from the x64 rootfs into the Anroid NDK so dotnet/runtime's
 # OpenSSL headers hack can find them for the linux-bionic build.