Move eng/common to eng/docker-tools

.github/ISSUE_TEMPLATE/releases/new-windows-release.md

@@ -7,7 +7,7 @@ Windows version: <version>
 1. - [ ] Well before the Windows release date, contact DDFUN to schedule the provisioning of an Azure scale set for the new Windows version.
 2. - [ ] If necessary, update [`PlatformInfo.cs`](https://github.com/dotnet/docker-tools/blob/main/src/ImageBuilder/ViewModel/PlatformInfo.cs) to generate the correct README display name from the version specified in the manifest. This is usually not needed unless Windows changes its naming scheme, since the code is version-independent.
 3. - [ ] Add support for new Windows version in common pipeline templates:
-      - [ ] Add new default pool variables to [`variables/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/variables/common.yml#L48-L59)
-      - [ ] Add parameter for new windows default pool in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/build-test-publish-repo.yml#L38-L39).
-      - [ ] Add new build and test jobs in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/build-test-publish-repo.yml) to support the new Windows version.
-      - [ ] If necessary, add new .NET-specific pool/image variables to [`variables/dotnet/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/variables/dotnet/common.yml#L43-L48) and reference them from [`stages/dotnet/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/dotnet/build-test-publish-repo.yml#L115-L122)
+      - [ ] Add new default pool variables to [`variables/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/variables/common.yml#L48-L59)
+      - [ ] Add parameter for new windows default pool in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/build-test-publish-repo.yml#L38-L39).
+      - [ ] Add new build and test jobs in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/build-test-publish-repo.yml) to support the new Windows version.
+      - [ ] If necessary, add new .NET-specific pool/image variables to [`variables/dotnet/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/variables/dotnet/common.yml#L43-L48) and reference them from [`stages/dotnet/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml#L115-L122)

eng/eng-common-file-pusher-config.json → eng/docker-tools-file-pusher-config.json

@@ -2,8 +2,8 @@
   "commitMessage": "Update common Docker engineering infrastructure with latest",
   "pullRequestTitle": "Update common Docker engineering infrastructure with latest",
   "pullRequestDescription": "Updates the common Docker engineering infrastructure with latest changes from the dotnet/docker-tools repo.",
-  "sourcePath": "eng/common",
-  "workingBranchSuffix": "-update-eng-common",
+  "sourcePath": "eng/docker-tools",
+  "workingBranchSuffix": "-update-docker-tools",
   "repos": [
     {
       "owner": "dotnet",

eng/common/Invoke-ImageBuilder.ps1 → eng/docker-tools/Invoke-ImageBuilder.ps1

@@ -64,9 +64,9 @@ try {
         # On Linux, ImageBuilder is run within a container.
         $imageBuilderImageName = "microsoft-dotnet-imagebuilder-withrepo"
         if ($ReuseImageBuilderImage -ne $True) {
-            & ./eng/common/Get-ImageBuilder.ps1
+            & ./eng/docker-tools/Get-ImageBuilder.ps1
             Exec ("docker build -t $imageBuilderImageName --build-arg " `
-                + "IMAGE=${imageNames.imageBuilderName} -f eng/common/Dockerfile.WithRepo .")
+                + "IMAGE=${imageNames.imageBuilderName} -f eng/docker-tools/Dockerfile.WithRepo .")
         }
 
         $imageBuilderCmd = "docker run --name $imageBuilderContainerName -v /var/run/docker.sock:/var/run/docker.sock $imageBuilderImageName"
@@ -78,7 +78,7 @@ try {
         $imageBuilderFolder = ".Microsoft.DotNet.ImageBuilder"
         $imageBuilderCmd = [System.IO.Path]::Combine($imageBuilderFolder, "Microsoft.DotNet.ImageBuilder.exe")
         if (-not (Test-Path -Path "$imageBuilderCmd" -PathType Leaf)) {
-            & ./eng/common/Get-ImageBuilder.ps1
+            & ./eng/docker-tools/Get-ImageBuilder.ps1
             Exec "docker create --name $imageBuilderContainerName ${imageNames.imageBuilderName}"
             $containerCreated = $true
             if (Test-Path -Path $imageBuilderFolder)

eng/common/Retain-Build.ps1 → eng/docker-tools/Retain-Build.ps1

@@ -1,7 +1,7 @@
-# Adapted from https://github.com/dotnet/arcade/blob/main/eng/common/retain-build.ps1
+# Adapted from https://github.com/dotnet/arcade/blob/main/eng/docker-tools/retain-build.ps1
 Param(
     [Parameter(Mandatory = $true)][int] $BuildId,
-    [Parameter(Mandatory = $true)][string] $AzdoOrgUri, 
+    [Parameter(Mandatory = $true)][string] $AzdoOrgUri,
     [Parameter(Mandatory = $true)][string] $AzdoProject,
     [Parameter(Mandatory = $true)][string] $Token
 )

eng/common/build.ps1 → eng/docker-tools/build.ps1

@@ -69,7 +69,7 @@ try {
         $args += ' --manifest "{0}"' -f $Manifest
     }
 
-    ./eng/common/Invoke-ImageBuilder.ps1 "build $args"
+    ./eng/docker-tools/Invoke-ImageBuilder.ps1 "build $args"
 }
 finally {
     popd

eng/common/templates/1es-official.yml → eng/docker-tools/templates/1es-official.yml

@@ -41,7 +41,7 @@ resources:
     ref: refs/tags/release
 
 extends:
-  template: /eng/common/templates/task-prefix-decorator.yml@self
+  template: /eng/docker-tools/templates/task-prefix-decorator.yml@self
   parameters:
     baseTemplate: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
     templateParameters:
@@ -63,7 +63,7 @@ extends:
           enabled: true
     stages:
     - ${{ if gt(length(parameters.serviceConnections), 0) }}:
-      - template: /eng/common/templates/stages/setup-service-connections.yml@self
+      - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
         parameters:
           pool: ${{ parameters.pool }}
           serviceConnections: ${{ parameters.serviceConnections }}

eng/common/templates/1es-unofficial.yml → eng/docker-tools/templates/1es-unofficial.yml

@@ -44,7 +44,7 @@ resources:
     ref: refs/tags/release
 
 extends:
-  template: /eng/common/templates/task-prefix-decorator.yml@self
+  template: /eng/docker-tools/templates/task-prefix-decorator.yml@self
   parameters:
     # Use a unique task prefix for unofficial pipelines
     taskPrefix: "🟦"
@@ -72,7 +72,7 @@ extends:
           enabled: true
     stages:
     - ${{ if gt(length(parameters.serviceConnections), 0) }}:
-      - template: /eng/common/templates/stages/setup-service-connections.yml@self
+      - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
         parameters:
           pool: ${{ parameters.pool }}
           serviceConnections: ${{ parameters.serviceConnections }}

eng/common/templates/1es.yml → eng/docker-tools/templates/1es.yml

@@ -48,7 +48,7 @@ resources:
     ref: refs/tags/release
 
 extends:
-  template: /eng/common/templates/task-prefix-decorator.yml@self
+  template: /eng/docker-tools/templates/task-prefix-decorator.yml@self
   parameters:
     baseTemplate: v1/1ES.${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'Official', 'Unofficial') }}.PipelineTemplate.yml@1ESPipelineTemplates
     templateParameters:

eng/common/templates/jobs/build-images.yml → eng/docker-tools/templates/jobs/build-images.yml

@@ -30,11 +30,11 @@ jobs:
     imageInfoContainerDir: $(artifactsPath)/imageInfo
   steps:
   - ${{ parameters.commonInitStepsForMatrixAndBuild }}
-  - template: /eng/common/templates/jobs/${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }}@self
+  - template: /eng/docker-tools/templates/jobs/${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }}@self
     parameters:
       cleanupDocker: true
   - ${{ parameters.customInitSteps }}
-  - template: /eng/common/templates/steps/set-image-info-path-var.yml@self
+  - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml@self
     parameters:
       publicSourceBranch: $(publicSourceBranch)
   - powershell: echo "##vso[task.setvariable variable=imageBuilderBuildArgs]"
@@ -62,7 +62,7 @@ jobs:
       echo "imageBuilderBuildArgs: $imageBuilderBuildArgs"
       echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$imageBuilderBuildArgs"
     displayName: Set Image Builder Build Args
-  - template: /eng/common/templates/steps/run-imagebuilder.yml@self
+  - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       name: BuildImages
       displayName: Build Images
@@ -93,7 +93,7 @@ jobs:
         --acr-resource-group '${{ parameters.publishConfig.buildAcr.resourceGroup }}'
         $(manifestVariables)
         $(imageBuilderBuildArgs)
-  - template: /eng/common/templates/steps/publish-artifact.yml@self
+  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
     parameters:
       path: $(imageInfoHostDir)
       artifactName: $(legName)-image-info-$(System.JobAttempt)
@@ -105,23 +105,23 @@ jobs:
         $images = "$(BuildImages.builtImages)"
         if (-not $images) { return 0 }
         $syftImageName = "${{ parameters.publishConfig.publicMirrorAcr.server }}/$(imageNames.syft)"
-        & $(engCommonPath)/Pull-Image.ps1 $syftImageName
+        & $(engDockerToolsPath)/Pull-Image.ps1 $syftImageName
         $images -Split ',' | ForEach-Object {
           echo "Generating SBOM for $_";
           $targetImageName = "$_";
           $formattedImageName = $targetImageName.Replace('${{ parameters.publishConfig.buildAcr.server }}/${{ parameters.publishConfig.buildAcr.repoPrefix }}', "").Replace('/', '_').Replace(':', '_');
           $sbomChildDir = "$(sbomDirectory)/$formattedImageName";
           New-Item -Type Directory -Path $sbomChildDir > $null;
-          docker build --output=$sbomChildDir -f $(engCommonPath)/Dockerfile.syft --build-arg SYFT_IMAGE_NAME=$syftImageName --build-arg TARGET_IMAGE_NAME=$targetImageName -t syft-sbom $(engCommonPath);
+          docker build --output=$sbomChildDir -f $(engDockerToolsPath)/Dockerfile.syft --build-arg SYFT_IMAGE_NAME=$syftImageName --build-arg TARGET_IMAGE_NAME=$targetImageName -t syft-sbom $(engDockerToolsPath);
         }
       displayName: Generate SBOMs
       condition: and(succeeded(), ne(variables['BuildImages.builtImages'], ''))
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    - template: /eng/common/templates/jobs/${{ format('../steps/test-images-{0}-client.yml', parameters.dockerClientOS) }}@self
+    - template: /eng/docker-tools/templates/jobs/${{ format('../steps/test-images-{0}-client.yml', parameters.dockerClientOS) }}@self
       parameters:
         condition: ne(variables.testScriptPath, '')
   - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.dockerClientOS, 'linux')) }}:
-    - template: /eng/common/templates/steps/publish-artifact.yml@self
+    - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
       parameters:
         path: $(sbomDirectory)
         artifactName: $(legName)-sboms

eng/common/templates/jobs/cg-build-projects.yml → eng/docker-tools/templates/jobs/cg-build-projects.yml

@@ -22,7 +22,7 @@ jobs:
     os: linux
   steps:
   - powershell: >
-      ./eng/common/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet"
+      ./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet"
     displayName: Run Dotnet Install Script
   - script: >
       find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build

eng/common/templates/jobs/copy-base-images-staging.yml → eng/docker-tools/templates/jobs/copy-base-images-staging.yml

@@ -19,7 +19,7 @@ parameters:
   default: false
 
 jobs:
-- template: /eng/common/templates/jobs/copy-base-images.yml@self
+- template: /eng/docker-tools/templates/jobs/copy-base-images.yml@self
   parameters:
     name: ${{ parameters.name }}
     pool: ${{ parameters.pool }}

eng/common/templates/jobs/copy-base-images.yml → eng/docker-tools/templates/jobs/copy-base-images.yml

@@ -28,9 +28,9 @@ jobs:
 - job: ${{ parameters.name }}
   pool: ${{ parameters.pool }}
   steps:
-  - template: /eng/common/templates/steps/init-docker-linux.yml@self
+  - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
   - ${{ parameters.customInitSteps }}
-  - template: /eng/common/templates/steps/copy-base-images.yml@self
+  - template: /eng/docker-tools/templates/steps/copy-base-images.yml@self
     parameters:
       acr: ${{ parameters.acr }}
       repoPrefix: ${{ parameters.repoPrefix }}

eng/common/templates/jobs/generate-matrix.yml → eng/docker-tools/templates/jobs/generate-matrix.yml

@@ -16,18 +16,18 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - ${{ parameters.commonInitStepsForMatrixAndBuild }}
-  - template: /eng/common/templates/steps/retain-build.yml@self
-  - template: /eng/common/templates/steps/init-docker-linux.yml@self
+  - template: /eng/docker-tools/templates/steps/retain-build.yml@self
+  - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
   - ${{ parameters.customInitSteps }}
-  - template: /eng/common/templates/steps/validate-branch.yml@self
+  - template: /eng/docker-tools/templates/steps/validate-branch.yml@self
     parameters:
       publishConfig: ${{ parameters.publishConfig }}
       internalProjectName: ${{ parameters.internalProjectName }}
-  - template: /eng/common/templates/steps/set-image-info-path-var.yml
+  - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml
     parameters:
       publicSourceBranch: $(publicSourceBranch)
   - ${{ if eq(parameters.isTestStage, true) }}:
-    - template: /eng/common/templates/steps/download-build-artifact.yml@self
+    - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self
       parameters:
         targetPath: $(Build.ArtifactStagingDirectory)
         artifactName: image-info
@@ -59,7 +59,7 @@ jobs:
       $(commonMatrixAndBuildOptions)
       $(additionalGenerateBuildMatrixOptions)"
     displayName: Set GenerateBuildMatrix Command
-  - template: /eng/common/templates/steps/run-imagebuilder.yml@self
+  - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       name: matrix
       displayName: Generate ${{ parameters.matrixType }} Matrix

eng/common/templates/jobs/post-build.yml → eng/docker-tools/templates/jobs/post-build.yml

@@ -13,8 +13,8 @@ jobs:
     imageInfosOutputSubDir: "/output"
     sbomOutputDir: "$(Build.ArtifactStagingDirectory)/sbom"
   steps:
-  - template: /eng/common/templates/steps/init-docker-linux.yml@self
-  - template: /eng/common/templates/steps/download-build-artifact.yml@self
+  - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
+  - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self
     parameters:
       targetPath: $(Build.ArtifactStagingDirectory)
       # This can fail if no build jobs ran to produce any artifacts
@@ -69,15 +69,15 @@ jobs:
         $(manifestVariables)
     name: MergeImageInfoFiles
     displayName: Merge Image Info Files
-  - template: /eng/common/templates/steps/publish-artifact.yml@self
+  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
     parameters:
       condition: and(succeeded(), ne(variables['MergeImageInfoFiles.noImageInfos'], 'true'))
       path: $(sbomOutputDir)
       artifactName: sboms
       displayName: Publish SBOM Artifact
       internalProjectName: ${{ parameters.internalProjectName }}
       publicProjectName: ${{ parameters.publicProjectName }}
-  - template: /eng/common/templates/steps/publish-artifact.yml@self
+  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
     parameters:
       condition: and(succeeded(), ne(variables['MergeImageInfoFiles.noImageInfos'], 'true'))
       path: $(imageInfosHostDir)$(imageInfosOutputSubDir)