Stage eng/common in Docker build contexts

premun · premun · commit c50cd4dfdb6c · 2026-08-04T16:11:23.000+02:00
Co-authored-by: Copilot App &lt;223556219+Copilot@users.noreply.github.com&gt;

Copilot-Session: bbbb249d-8b99-4e6e-a3c8-5597ef63a4a2
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,6 @@ artifacts/
 
 # ImageBuilder directory
 .Microsoft.DotNet.ImageBuilder
+
+# eng/common copies staged into Docker build contexts
+src/**/eng/common/
diff --git a/build.ps1 b/build.ps1
@@ -11,7 +11,13 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 pushd $PSScriptRoot
 try {
-    ./eng/docker-tools/build.ps1 -Paths $Paths -OptionalImageBuilderArgs $OptionalImageBuilderArgs
+    ./eng/Stage-EngCommon.ps1
+    try {
+        ./eng/docker-tools/build.ps1 -Paths $Paths -OptionalImageBuilderArgs $OptionalImageBuilderArgs
+    }
+    finally {
+        ./eng/Stage-EngCommon.ps1 -Clean
+    }
 }
 finally {
     popd
diff --git a/eng/Stage-EngCommon.ps1 b/eng/Stage-EngCommon.ps1
@@ -0,0 +1,29 @@
+[CmdletBinding()]
+param(
+    [switch]$Clean
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$repoRoot = Split-Path $PSScriptRoot -Parent
+$source = Join-Path $PSScriptRoot 'common'
+$dockerfiles = Get-ChildItem (Join-Path $repoRoot 'src') -Filter Dockerfile -File -Recurse |
+    Where-Object {
+        Select-String -LiteralPath $_.FullName -Pattern '^\s*COPY\s+eng/common/' -Quiet
+    }
+
+foreach ($dockerfile in $dockerfiles) {
+    $engDirectory = Join-Path $dockerfile.Directory.FullName 'eng'
+    $destination = Join-Path $engDirectory 'common'
+
+    if (Test-Path -LiteralPath $destination) {
+        Remove-Item -LiteralPath $destination -Recurse -Force
+    }
+
+    if (-not $Clean) {
+        New-Item -Path $engDirectory -ItemType Directory -Force | Out-Null
+        Copy-Item -LiteralPath $source -Destination $engDirectory -Recurse -Force
+        Write-Host "Staged eng/common next to $($dockerfile.FullName)"
+    }
+}
diff --git a/eng/cross-scripts.Dockerfile b/eng/cross-scripts.Dockerfile
diff --git a/eng/pipelines/stages/dotnet-buildtools-prereqs.yml b/eng/pipelines/stages/dotnet-buildtools-prereqs.yml
@@ -24,18 +24,22 @@ stages:
         name: NetCore1ESPool-Internal-XL
         image: build.ubuntu.2204.amd64
         os: linux
-      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        customCopyBaseImagesInitSteps:
+      customBuildInitSteps:
+      - powershell: ./eng/Stage-EngCommon.ps1
+        displayName: Stage eng/common in Docker build contexts
+        condition: eq(variables['Agent.OS'], 'Linux')
+      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        - template: /eng/pipelines/steps/pip-authenticate.yml@self
         - template: /eng/pipelines/steps/set-base-image-override-options.yml@self
           parameters:
-            variableName: customCopyBaseImagesArgs
+            variableName: imageBuilderBuildArgs
             dockerfileOs: (centos|debian)
             baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group
-        customBuildInitSteps:
-        - template: /eng/pipelines/steps/pip-authenticate.yml@self
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        customCopyBaseImagesInitSteps:
         - template: /eng/pipelines/steps/set-base-image-override-options.yml@self
           parameters:
-            variableName: imageBuilderBuildArgs
+            variableName: customCopyBaseImagesArgs
             dockerfileOs: (centos|debian)
             baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group
       # Force all images to be rebuilt when triggered by the schedule
diff --git a/src/azurelinux/3.0/net10.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/crossdeps-builder/amd64/Dockerfile
@@ -1,7 +1,3 @@
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/azurelinux/base/core:3.0
 
 ARG PIP_INDEX_URL
@@ -136,7 +132,7 @@ RUN \
 ENV PATH="/opt/llvm/bin:$PATH"
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 # Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
 ENV PIP_INDEX_URL=
diff --git a/src/azurelinux/3.0/net11.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net11.0/crossdeps-builder/amd64/Dockerfile
@@ -1,7 +1,3 @@
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/azurelinux/base/core:3.0
 
 ARG PIP_INDEX_URL
@@ -133,7 +129,7 @@ RUN \
 ENV PATH="/opt/llvm/bin:$PATH"
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 # Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
 ENV PIP_INDEX_URL=
diff --git a/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile
@@ -1,7 +1,3 @@
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/azurelinux/base/core:3.0
 
 ARG PIP_INDEX_URL
@@ -120,7 +116,7 @@ RUN \
 ENV PATH="/opt/llvm/bin:$PATH"
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 # Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
 ENV PIP_INDEX_URL=
diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile
@@ -1,7 +1,3 @@
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/azurelinux/base/core:3.0
 
 ARG PIP_INDEX_URL
@@ -120,7 +116,7 @@ RUN \
 ENV PATH="/opt/llvm/bin:$PATH"
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 # Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
 ENV PIP_INDEX_URL=
diff --git a/src/azurelinux/4.0/net11.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/4.0/net11.0/crossdeps-builder/amd64/Dockerfile
@@ -1,7 +1,3 @@
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
 
 ARG PIP_INDEX_URL
@@ -136,7 +132,7 @@ RUN \
 ENV PATH="/opt/llvm/bin:$PATH"
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 # Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
 ENV PIP_INDEX_URL=
diff --git a/src/azurelinux/manifest.json b/src/azurelinux/manifest.json
@@ -18,18 +18,6 @@
             }
           ]
         },
-        {
-          "platforms": [
-            {
-              "dockerfile": "eng/cross-scripts.Dockerfile",
-              "os": "linux",
-              "osVersion": "azurelinux3.0",
-              "tags": {
-                "cross-scripts-amd64": {}
-              }
-            }
-          ]
-        },
         {
           "sharedTags": {
             "azurelinux3.0-docker-testrunner": {}
diff --git a/src/ubuntu/22.04/cross/armel-tizen/Dockerfile b/src/ubuntu/22.04/cross/armel-tizen/Dockerfile
@@ -1,14 +1,10 @@
 ARG ROOTFS_DIR=/crossrootfs/armel
 
-# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
-# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
-
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps AS builder
 ARG ROOTFS_DIR
 
 # Copy arcade scripts used to build rootfs
-COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
+COPY eng/common/cross/ /scripts/eng/common/cross/
 
 RUN /scripts/eng/common/cross/tizen-build-rootfs.sh armel
 
diff --git a/tests/Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests/ManifestTests.cs b/tests/Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests/ManifestTests.cs
@@ -24,23 +24,10 @@ public ManifestTests(ITestOutputHelper outputHelper)
     public void ValidateFolderStructure()
     {
         var crossArchPrefixes = new HashSet<string> { "amd64", "arm", "loongarch64", "ppc64le", "riscv64", "s390x", "x86" };
-        // Dockerfiles that intentionally don't follow the src/<...>/<arch> folder convention.
-        var excludedDockerfilePaths = new HashSet<string>
-        {
-            // Packages eng/common/cross so other images can COPY --from it. It is built from the
-            // eng/ context (rather than a src/<...>/<arch> folder) so that eng/common/cross is
-            // available in its build context.
-            "eng/cross-scripts.Dockerfile",
-        };
         var invalidDockerfilePaths = new List<string>();
 
         EnumerateManifests((platforms, platform, dockerfilePath, arch) =>
             {
-                if (excludedDockerfilePaths.Contains(dockerfilePath))
-                {
-                    return;
-                }
-
                 if (IsCrossDockerfile(dockerfilePath))
                 {
                     var lastFolder = Path.GetFileName(dockerfilePath);
@@ -81,9 +68,6 @@ public void ValidateTags()
         var excludedDockerfilePaths = new HashSet<string>
         {
             "src/ubuntu/common/coredeps", // This Dockerfile is built for multiple platforms via BuildArgs
-            // Packages eng/common/cross so other images can COPY --from it. Its tag intentionally
-            // isn't derived from a src/<...>/<arch> path because it is built from the eng/ context.
-            "eng/cross-scripts.Dockerfile",
         };
 
         var invalidTags = new List<string>();
