Update eng/common references to eng/docker-tools

lbussell · lbussell · commit bfc630629718 · 2025-12-08T15:10:26.000-08:00
diff --git a/.github/workflows/lint-code-base.yml b/.github/workflows/lint-code-base.yml
@@ -25,6 +25,6 @@ jobs:
         uses: github/super-linter@v6 # https://github.com/github/super-linter
         env:
           DEFAULT_BRANCH: main
-          FILTER_REGEX_EXCLUDE: eng/common/.*|eng/readme-templates/.*|.portal-docs/.*
+          FILTER_REGEX_EXCLUDE: eng/docker-tools/.*|eng/readme-templates/.*|.portal-docs/.*
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_MARKDOWN: true
diff --git a/build-and-test.ps1 b/build-and-test.ps1
@@ -24,14 +24,14 @@ if ($Repos.Count -eq 0) {
 else {
     $Paths = @()
     $Repos | foreach {
-        
+
         $Paths += "src/$_/$Version/$OS"
     }
     $testCategories = $Repos
 }
 
 if ($Mode -eq "BuildAndTest" -or $Mode -eq "Build") {
-    & ./eng/common/build.ps1 `
+    & ./eng/docker-tools/build.ps1 `
         -Version $Version `
         -OS $OS `
         -Paths $Paths `
diff --git a/eng/dockerfile-templates/Get-GeneratedDockerfiles.ps1 b/eng/dockerfile-templates/Get-GeneratedDockerfiles.ps1
@@ -22,10 +22,10 @@ $onDockerfilesGeneratedLinux = {
 # On Windows, ImageBuilder is run locally due to limitations with running Docker client within a container.
 # Remove when https://github.com/dotnet/docker-tools/issues/159 is resolved
 if ($dockerOs -eq "windows") {
-    & $PSScriptRoot/../common/Invoke-ImageBuilder.ps1 `
+    & $PSScriptRoot/../docker-tools/Invoke-ImageBuilder.ps1 `
         -ImageBuilderArgs $imageBuilderArgs
 } else {
-    & $PSScriptRoot/../common/Invoke-ImageBuilder.ps1 `
+    & $PSScriptRoot/../docker-tools/Invoke-ImageBuilder.ps1 `
         -ImageBuilderArgs $imageBuilderArgs `
         -OnCommandExecuted $onDockerfilesGeneratedLinux
 }
diff --git a/eng/pipelines/cg-detection.yml b/eng/pipelines/cg-detection.yml
@@ -23,13 +23,13 @@ variables:
   value: false
 
 extends:
-  template: /eng/common/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es-official.yml@self
   parameters:
     cgDryRun: ${{ parameters.cgDryRun }}
     stages:
     - stage: CgDetection
       displayName: CG Detection
       jobs:
-      - template: /eng/common/templates/jobs/cg-build-projects.yml@self
+      - template: /eng/docker-tools/templates/jobs/cg-build-projects.yml@self
         parameters:
           cgDryRun: ${{ parameters.cgDryRun }}
diff --git a/eng/pipelines/dotnet-framework-pr-no-cache.yml b/eng/pipelines/dotnet-framework-pr-no-cache.yml
@@ -24,7 +24,7 @@ variables:
   readonly: true
 
 stages:
-- template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self
+- template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self
   parameters:
     stagesTemplate: /eng/pipelines/stages/dotnet-framework-base.yml@self
     stagesTemplateParameters:
diff --git a/eng/pipelines/dotnet-framework-pr.yml b/eng/pipelines/dotnet-framework-pr.yml
@@ -23,7 +23,7 @@ variables:
   value: manifest.json
 
 stages:
-- template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self
+- template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self
   parameters:
     stagesTemplate: /eng/pipelines/stages/dotnet-framework-base.yml@self
     stagesTemplateParameters:
diff --git a/eng/pipelines/dotnet-framework-samples.yml b/eng/pipelines/dotnet-framework-samples.yml
@@ -28,19 +28,19 @@ parameters:
 
 variables:
 - template: /eng/pipelines/variables/common.yml@self
-- template: /eng/common/templates/variables/dotnet/secrets${{ iif(contains(variables['Build.DefinitionName'], '-official'), '', '-unofficial') }}.yml@self
+- template: /eng/docker-tools/templates/variables/dotnet/secrets${{ iif(contains(variables['Build.DefinitionName'], '-official'), '', '-unofficial') }}.yml@self
 - name: manifest
   value: manifest.samples.json
 - name: imageInfoVariant
   value: "-samples"
 
 extends:
-  template: /eng/common/templates/1es.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
     reposToExcludeFromScanning:
     - VersionsRepo
     stages:
-    - template: /eng/common/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
+    - template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
       parameters:
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
         stagesTemplate: /eng/pipelines/stages/dotnet-framework-base.yml@self
diff --git a/eng/pipelines/dotnet-framework.yml b/eng/pipelines/dotnet-framework.yml
@@ -28,19 +28,19 @@ parameters:
 
 variables:
 - template: /eng/pipelines/variables/common.yml@self
-- template: /eng/common/templates/variables/dotnet/secrets${{ iif(contains(variables['Build.DefinitionName'], '-official'), '', '-unofficial') }}.yml@self
+- template: /eng/docker-tools/templates/variables/dotnet/secrets${{ iif(contains(variables['Build.DefinitionName'], '-official'), '', '-unofficial') }}.yml@self
 - name: manifest
   value: manifest.json
 - name: mcrImageIngestionTimeout
   value: "00:30:00"
 
 extends:
-  template: /eng/common/templates/1es.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
     reposToExcludeFromScanning:
     - VersionsRepo
     stages:
-    - template: /eng/common/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
+    - template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
       parameters:
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
         stagesTemplate: /eng/pipelines/stages/dotnet-framework-base.yml@self
diff --git a/eng/pipelines/stages/dotnet-framework-base.yml b/eng/pipelines/stages/dotnet-framework-base.yml
@@ -24,7 +24,7 @@ parameters:
 
 stages:
 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-  - template: /eng/common/templates/stages/setup-service-connections.yml@self
+  - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
     parameters:
       serviceConnections:
       - name: ${{ parameters.publishConfig.internalMirrorAcr.serviceConnection.name }}
@@ -33,7 +33,7 @@ stages:
       - ${{ each serviceConnection in parameters.additionalServiceConnections }}:
         - name: ${{ serviceConnection.name }}
 
-- template: /eng/common/templates/stages/dotnet/build-test-publish-repo.yml@self
+- template: /eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml@self
   parameters:
     publishConfig: ${{ parameters.publishConfig }}
     internalProjectName: ${{ parameters.internalProjectName }}
diff --git a/eng/pipelines/update-readmes.yml b/eng/pipelines/update-readmes.yml
@@ -7,7 +7,7 @@ variables:
   value: manifest.json
 
 extends:
-  template: /eng/common/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es-official.yml@self
   parameters:
     stages:
     - stage: UpdateReadmes
@@ -16,6 +16,6 @@ extends:
       - job: UpdateReadmes
         displayName: Update Readmes
         steps:
-        - template: /eng/common/templates/steps/init-docker-linux.yml@self
-        - template: /eng/common/templates/steps/publish-readmes.yml@self
-        - template: /eng/common/templates/steps/cleanup-docker-linux.yml@self
+        - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
+        - template: /eng/docker-tools/templates/steps/publish-readmes.yml@self
+        - template: /eng/docker-tools/templates/steps/cleanup-docker-linux.yml@self
diff --git a/eng/pipelines/variables/common.yml b/eng/pipelines/variables/common.yml
@@ -1,5 +1,5 @@
 variables:
-- template: /eng/common/templates/variables/dotnet/build-test-publish.yml@self
+- template: /eng/docker-tools/templates/variables/dotnet/build-test-publish.yml@self
 
 - name: "publicGitRepoUri"
   value: "https://github.com/microsoft/dotnet-framework-docker"
diff --git a/eng/readme-templates/Get-GeneratedReadmes.ps1 b/eng/readme-templates/Get-GeneratedReadmes.ps1
@@ -51,10 +51,10 @@ function Invoke-GenerateReadme {
     # On Windows, ImageBuilder is run locally due to limitations with running Docker client within a container.
     # Remove when https://github.com/dotnet/docker-tools/issues/159 is resolved
     if ($dockerOs -eq "windows") {
-        & $PSScriptRoot/../common/Invoke-ImageBuilder.ps1 `
+        & $PSScriptRoot/../docker-tools/Invoke-ImageBuilder.ps1 `
             -ImageBuilderArgs $imageBuilderArgs
     } else {
-        & $PSScriptRoot/../common/Invoke-ImageBuilder.ps1 `
+        & $PSScriptRoot/../docker-tools/Invoke-ImageBuilder.ps1 `
             -ImageBuilderArgs $imageBuilderArgs `
             -OnCommandExecuted $onDockerfilesGeneratedLinux
     }
diff --git a/tests/run-tests.ps1 b/tests/run-tests.ps1
@@ -12,15 +12,15 @@ param(
     [string[]]$Paths = @(),
 
     [string]$Architecture,
-    
+
     [string[]]$OSVersions = @(),
-    
+
     [string]$Registry,
-    
+
     [string]$RepoPrefix,
-    
+
     [switch]$PullImages,
-    
+
     [string]$ImageInfoPath,
 
     [ValidateSet('runtime', 'sdk', 'aspnet', 'wcf', 'pre-build')]
@@ -54,7 +54,7 @@ $ErrorActionPreference = 'Stop'
 
 # Install the .NET Core SDK
 $DotnetInstallDir = "$PSScriptRoot/../.dotnet"
-& $PSScriptRoot/../eng/common/Install-DotNetSdk.ps1 $dotnetInstallDir
+& $PSScriptRoot/../eng/docker-tools/Install-DotNetSdk.ps1 $dotnetInstallDir
 
 $activeOS = docker version -f "{{ .Server.Os }}"
 
