Skip to content

Commit 7c663b8

Browse files
Update common Docker engineering infrastructure with latest
1 parent 9df825d commit 7c663b8

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

eng/docker-tools/Dockerfile.WithRepo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
ARG IMAGE
33
FROM $IMAGE
44

5+
# Keep this path in sync with $(containerBuildRepoRoot) in
6+
# eng/docker-tools/templates/steps/init-matrix-build-publish.yml
57
WORKDIR /repo
68
COPY . .

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ jobs:
153153

154154
- template: /eng/docker-tools/templates/steps/publish-readmes.yml@self
155155
parameters:
156+
publishConfig: ${{ parameters.publishConfig }}
156157
dryRunArg: $(dryRunArg)
157158
condition: and(succeeded(), eq(variables['publishReadme'], 'true'))
158159

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ steps:
2727
$commonMatrixAndBuildOptions = "$commonMatrixAndBuildOptions --base-override-regex '^(?!mcr\.microsoft\.com)' --base-override-sub '$(public-mirror.server)/'"
2828
}
2929
30+
$containerBuildRepoRoot="/repo"
31+
3032
if ("${{ parameters.versionsRepoRef }}" -ne "") {
3133
$versionsBasePath = "${{ parameters.versionsRepoPath }}/"
3234
$pipelineDisabledCache = "false"
@@ -39,14 +41,18 @@ steps:
3941
$buildRepoName = "$(Build.Repository.Name)"
4042
}
4143
44+
# When multiple repos are checked out in Azure Pipelines, each repo is placed in a subfolder
45+
# under the main working directory. The subfolder is named after the repo.
46+
$containerBuildRepoRoot = "$containerBuildRepoRoot/$buildRepoName"
47+
4248
$engDockerToolsPath = "$(Build.Repository.LocalPath)/$buildRepoName/$(engDockerToolsRelativePath)"
4349
4450
$engPath = "$(Build.Repository.LocalPath)/$buildRepoName/eng"
45-
$manifest = "$buildRepoName/$(manifest)"
46-
$testResultsDirectory = "$buildRepoName/$testResultsDirectory"
51+
$manifest = "$containerBuildRepoRoot/$(manifest)"
52+
$testResultsDirectory = "$containerBuildRepoRoot/$testResultsDirectory"
4753
4854
if ("$(testScriptPath)") {
49-
$testScriptPath = "$buildRepoName/$(testScriptPath)"
55+
$testScriptPath = "$containerBuildRepoRoot/$(testScriptPath)"
5056
}
5157
5258
echo "##vso[task.setvariable variable=buildRepoName]$buildRepoName"
@@ -64,6 +70,7 @@ steps:
6470
echo "##vso[task.setvariable variable=commonMatrixAndBuildOptions]$commonMatrixAndBuildOptions"
6571
echo "##vso[task.setvariable variable=versionsBasePath]$versionsBasePath"
6672
echo "##vso[task.setvariable variable=pipelineDisabledCache]$pipelineDisabledCache"
73+
echo "##vso[task.setvariable variable=containerBuildRepoRoot]$containerBuildRepoRoot"
6774
displayName: Set Common Variables for Matrix, Build, and Publish
6875

6976
- ${{ if ne(parameters.versionsRepoRef, '') }}:

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
parameters:
2-
dryRunArg: ""
3-
condition: true
2+
- name: publishConfig
3+
type: object
4+
- name: dryRunArg
5+
type: string
6+
default: ""
7+
- name: condition
8+
type: string
9+
default: "true"
410

511
steps:
612
- script: >

0 commit comments

Comments
 (0)