Skip to content

[main] Update common Docker engineering infrastructure with latest #1241

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/common/templates/jobs/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
'$(imageInfoContainerDir)/full-image-info-new.json'
'$(gitHubVersionsRepoInfo.userName)'
'$(gitHubVersionsRepoInfo.email)'
'$(gitHubVersionsRepoInfo.accessToken)'
$(gitHubVersionsRepoInfo.authArgs)
--git-owner '$(gitHubVersionsRepoInfo.org)'
--git-repo '$(gitHubVersionsRepoInfo.repo)'
--git-branch '$(gitHubVersionsRepoInfo.branch)'
Expand All @@ -192,7 +192,7 @@ jobs:
'$(System.AccessToken)'
'$(azdoOrgName)'
'$(System.TeamProject)'
'$(gitHubNotificationsRepoInfo.accessToken)'
$(gitHubNotificationsRepoInfo.authArgs)
'$(gitHubNotificationsRepoInfo.org)'
'$(gitHubNotificationsRepoInfo.repo)'
--repo-prefix '$(publishRepoPrefix)'
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/steps/publish-readmes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ steps:
--registry-override '$(acr.server)'
'$(mcrDocsRepoInfo.userName)'
'$(mcrDocsRepoInfo.email)'
'$(mcrDocsRepoInfo.accessToken)'
$(mcrDocsRepoInfo.authArgs)
'$(publicGitRepoUri)'
${{ parameters.dryRunArg }}
$(manifestVariables)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/docker-images.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2662183
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2694940
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
12 changes: 6 additions & 6 deletions eng/common/templates/variables/dotnet/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ variables:
- name: officialRepoPrefixes
value: public/,internal/private/,unlisted/

- name: mcrDocsRepoInfo.accessToken
value: $(BotAccount-dotnet-docker-bot-PAT)
- name: mcrDocsRepoInfo.authArgs
value: --gh-token '$(BotAccount-dotnet-docker-bot-PAT)'
- name: mcrDocsRepoInfo.userName
value: $(dotnetDockerBot.userName)
- name: mcrDocsRepoInfo.email
Expand All @@ -27,8 +27,8 @@ variables:
value: dotnet
- name: gitHubNotificationsRepoInfo.repo
value: dotnet-docker-internal
- name: gitHubNotificationsRepoInfo.accessToken
value: $(BotAccount-dotnet-docker-bot-PAT)
- name: gitHubNotificationsRepoInfo.authArgs
value: --gh-token '$(BotAccount-dotnet-docker-bot-PAT)'

- name: gitHubVersionsRepoInfo.org
value: dotnet
Expand All @@ -38,8 +38,8 @@ variables:
value: main
- name: gitHubVersionsRepoInfo.path
value: ${{ variables.commonVersionsImageInfoPath }}
- name: gitHubVersionsRepoInfo.accessToken
value: $(BotAccount-dotnet-docker-bot-PAT)
- name: gitHubVersionsRepoInfo.authArgs
value: --gh-token '$(BotAccount-dotnet-docker-bot-PAT)'
- name: gitHubVersionsRepoInfo.userName
value: $(dotnetDockerBot.userName)
- name: gitHubVersionsRepoInfo.email
Expand Down
Loading