Skip to content

Commit 34bd5b6

Browse files
[main] Update common Docker engineering infrastructure with latest (#1724)
1 parent 25901d4 commit 34bd5b6

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

eng/docker-tools/DEV-GUIDE.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,10 @@ The system has built-in retry logic but requires manual intervention after repea
352352

353353
Once you've fixed the underlying problem (Dockerfile change, test fix, etc.) and have a successful build:
354354

355-
1. Navigate to the successful pipeline run in Azure DevOps
356-
2. Add the `autobuilder` label to that run
357-
3. This signals to the infrastructure that a successful build has occurred
358-
4. The system will resume automatic rebuilds for that image as needed
355+
1. Manually queue a build for the affected image paths
356+
2. After the build succeeds, the system will resume automatic rebuilds for that image as needed
359357

360-
The `autobuilder` label is how the infrastructure tracks that the failure cycle has been broken and normal operations can resume.
358+
The infrastructure considers the three most recent pipeline runs, so any successful run breaks the failure cycle.
361359

362360
---
363361

eng/docker-tools/Install-DotNetSdk.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ param(
2020
[string]
2121
$InstallPath,
2222
[string]
23-
$Channel = "9.0"
23+
$Channel = "10.0"
2424
)
2525

2626
Set-StrictMode -Version Latest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ parameters:
1515
# See https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#options for possible Channel values
1616
- name: dotnetVersionChannel
1717
type: string
18-
default: '9.0'
18+
default: '10.0'
1919
displayName: .NET Version
2020
# Additional steps to run before building projects (e.g. custom SDK installation).
2121
- name: initSteps

eng/docker-tools/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@sha256:9207adb1b8a9d2fa45e6abdba824f25993ea8ebb5d48b7fd7e4a6c4708bcadb4
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:50bbef5b6a77ef620da3f3f759a83d870ca73a53fd19e7d8c422e3717e7f97ec
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

0 commit comments

Comments
 (0)