Skip to content

[nightly] Update common Docker engineering infrastructure with latest #7480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbussell merged 1 commit into from
Nov 10, 2026
Merged

[nightly] Update common Docker engineering infrastructure with latest #7480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions eng/docker-tools/templates/jobs/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
$(dryRunArg)

- script: >
$(runImageBuilderCmd) publishImageInfo
$(runAuthedImageBuilderCmd) publishImageInfo
'imageInfo/full-image-info-new.json'
'$(gitHubVersionsRepoInfo.userName)'
'$(gitHubVersionsRepoInfo.email)'
Expand All @@ -210,6 +210,9 @@ jobs:
$(imageBuilder.commonCmdArgs)
condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
displayName: Publish Image Info
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
SYSTEM_OIDCREQUESTURI: $(System.OidcRequestUri)

# Task displayNames names are hardcoded to reference the task prefix used by 1ES official
# pipelines in eng/docker-tools/templates/1es-official.yml.
Expand All @@ -224,7 +227,7 @@ jobs:
# Skipped for PR builds because manifest lists are not created in PR builds (see post-build.yml).
# Without manifest lists present in image-info.json, the postPublishNotification fails with a NRE.
- script: >
$(runImageBuilderCmd) postPublishNotification
$(runAuthedImageBuilderCmd) postPublishNotification
'$(publishNotificationRepoName)'
'$(branchName)'
'imageInfo/image-info.json'
Expand All @@ -247,6 +250,9 @@ jobs:
$(imageBuilder.commonCmdArgs)
displayName: Post Publish Notification
condition: and(always(), eq(variables['publishNotificationsEnabled'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
SYSTEM_OIDCREQUESTURI: $(System.OidcRequestUri)

- powershell: |
# Default to current build number if parameter was not overridden
Expand Down
5 changes: 4 additions & 1 deletion eng/docker-tools/templates/stages/dotnet/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ stages:
publishConfig: ${{ parameters.publishConfig }}
isStandalonePublish: ${{ parameters.isStandalonePublish }}
customInitSteps: ${{ parameters.customInitSteps }}
additionalServiceConnections: ${{ parameters.additionalServiceConnections }}
additionalServiceConnections:
- ${{ if variables['dotnetContainersBot.gitHubAuthArgs'] }}:
- name: DotnetContainersGitHubBot
- ${{ parameters.additionalServiceConnections }}
sourceBuildPipelineDefinitionId: ${{ parameters.sourceBuildPipelineDefinitionId }}
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
versionsRepoRef: ${{ parameters.versionsRepoRef }}
Expand Down
2 changes: 1 addition & 1 deletion eng/docker-tools/templates/variables/docker-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:721605af80411eb4bed16c4ca91873445a967b4ce5b60c77661ddc0701c5a412
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:4d4e1dd1e33a03684baa7fdeefd04d3788caaa22351fe54e743a4b0b57cba259
imageNames.imageBuilder: $(imageNames.imageBuilderName)
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner
Expand Down
10 changes: 8 additions & 2 deletions eng/docker-tools/templates/variables/dotnet/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ variables:
- name: dockerHubRegistryCreds
value: --registry-creds 'docker.io=$(dotnetDockerHubBot.userName);$(BotAccount-dotnet-dockerhub-bot-PAT)'

- name: dotnetContainersBot.gitHubAuthArgs
value: >-
--gh-app-client-id '$(dotnetContainersBot.gitHubApp.clientId)'
--gh-app-key-uri '$(dotnetContainersBot.gitHubApp.privateKeyUri)'
--gh-app-key-service-connection '$(dotnetContainersBot.serviceConnection.tenantId):$(dotnetContainersBot.serviceConnection.clientId):$(dotnetContainersBot.serviceConnection.id)'

- name: gitHubNotificationsRepoInfo.authArgs
value: --gh-token '$(BotAccount-dotnet-docker-bot-PAT)'
value: $(dotnetContainersBot.gitHubAuthArgs)

- name: gitHubVersionsRepoInfo.authArgs
value: --gh-token '$(BotAccount-dotnet-docker-bot-PAT)'
value: $(dotnetContainersBot.gitHubAuthArgs)

- name: mcrDocsRepoInfo.authArgs
value: >-
Expand Down
Loading