Revert "Add variable for repo root in ImageBuilder container image" (#1883)

Reverts #1876 because it caused issues when flowing
to dotnet-docker: see dotnet/dotnet-docker#6869

Author: lbussell

eng/docker-tools/Dockerfile.WithRepo

@@ -2,7 +2,5 @@
 ARG IMAGE
 FROM $IMAGE
 
-# Keep this path in sync with $(containerBuildRepoRoot) in
-# eng/docker-tools/templates/steps/init-matrix-build-publish.yml
 WORKDIR /repo
 COPY . .

eng/docker-tools/templates/jobs/publish.yml

@@ -153,7 +153,6 @@ jobs:
 
   - template: /eng/docker-tools/templates/steps/publish-readmes.yml@self
     parameters:
-      publishConfig: ${{ parameters.publishConfig }}
       dryRunArg: $(dryRunArg)
       condition: and(succeeded(), eq(variables['publishReadme'], 'true'))
 

eng/docker-tools/templates/steps/init-matrix-build-publish.yml

@@ -27,8 +27,6 @@ steps:
       $commonMatrixAndBuildOptions = "$commonMatrixAndBuildOptions --base-override-regex '^(?!mcr\.microsoft\.com)' --base-override-sub '$(public-mirror.server)/'"
     }
 
-    $containerBuildRepoRoot="/repo"
-
     if ("${{ parameters.versionsRepoRef }}" -ne "") {
       $versionsBasePath = "${{ parameters.versionsRepoPath }}/"
       $pipelineDisabledCache = "false"
@@ -41,18 +39,14 @@ steps:
         $buildRepoName = "$(Build.Repository.Name)"
       }
 
-      # When multiple repos are checked out in Azure Pipelines, each repo is placed in a subfolder
-      # under the main working directory. The subfolder is named after the repo.
-      $containerBuildRepoRoot = "$containerBuildRepoRoot/$buildRepoName"
-
       $engDockerToolsPath = "$(Build.Repository.LocalPath)/$buildRepoName/$(engDockerToolsRelativePath)"
 
       $engPath = "$(Build.Repository.LocalPath)/$buildRepoName/eng"
-      $manifest = "$containerBuildRepoRoot/$(manifest)"
-      $testResultsDirectory = "$containerBuildRepoRoot/$testResultsDirectory"
+      $manifest = "$buildRepoName/$(manifest)"
+      $testResultsDirectory = "$buildRepoName/$testResultsDirectory"
 
       if ("$(testScriptPath)") {
-        $testScriptPath = "$containerBuildRepoRoot/$(testScriptPath)"
+        $testScriptPath = "$buildRepoName/$(testScriptPath)"
       }
 
       echo "##vso[task.setvariable variable=buildRepoName]$buildRepoName"
@@ -70,7 +64,6 @@ steps:
     echo "##vso[task.setvariable variable=commonMatrixAndBuildOptions]$commonMatrixAndBuildOptions"
     echo "##vso[task.setvariable variable=versionsBasePath]$versionsBasePath"
     echo "##vso[task.setvariable variable=pipelineDisabledCache]$pipelineDisabledCache"
-    echo "##vso[task.setvariable variable=containerBuildRepoRoot]$containerBuildRepoRoot"
   displayName: Set Common Variables for Matrix, Build, and Publish
 
 - ${{ if ne(parameters.versionsRepoRef, '') }}:

eng/docker-tools/templates/steps/publish-readmes.yml

@@ -1,12 +1,6 @@
 parameters:
-- name: publishConfig
-  type: object
-- name: dryRunArg
-  type: string
-  default: ""
-- name: condition
-  type: string
-  default: "true"
+  dryRunArg: ""
+  condition: true
 
 steps:
 - script: >