Skip to content

Commit ae8202c

Browse files
Update common Docker engineering infrastructure with latest
1 parent 9de0cb6 commit ae8202c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

eng/common/templates/jobs/build-images.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ jobs:
126126
displayName: Publish Image Info File Artifact
127127
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
128128
# Define the task here to load it into the agent so that we can invoke the tool manually
129-
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
129+
# TODO: Revert the build-specific pinned version when https://github.com/dotnet/docker-tools/issues/1152 is fixed
130+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0.197.56
130131
inputs:
131132
BuildDropPath: $(Build.ArtifactStagingDirectory)
132133
displayName: Load Manifest Generator

eng/common/templates/stages/dotnet/build-test-publish-repo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
windowsAmdBuildJobTimeout: 60
1515
windowsAmdTestJobTimeout: 60
1616
linuxAmdBuildJobTimeout: 60
17-
linuxAmd64Pool: ""
17+
linuxAmd64Pool: null
1818
buildMatrixType: platformDependencyGraph
1919
testMatrixType: platformVersionedOs
2020

@@ -62,7 +62,7 @@ stages:
6262
- group: DotNet-AllOrgs-Darc-Pats
6363

6464
linuxAmd64Pool:
65-
${{ if ne(parameters.linuxAmd64Pool, '') }}:
65+
${{ if parameters.linuxAmd64Pool }}:
6666
${{ parameters.linuxAmd64Pool }}
6767
${{ elseif eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
6868
vmImage: $(defaultLinuxAmd64PoolImage)

eng/common/templates/variables/docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2199899
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2207880
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-bullseye-slim-docker-testrunner

0 commit comments

Comments
 (0)