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

Author: dotnet-docker-bot

eng/common/templates/jobs/publish.yml

@@ -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)'
@@ -192,7 +192,7 @@ jobs:
       '$(System.AccessToken)'
       '$(azdoOrgName)'
       '$(System.TeamProject)'
-      '$(gitHubNotificationsRepoInfo.accessToken)'
+      $(gitHubNotificationsRepoInfo.authArgs)
       '$(gitHubNotificationsRepoInfo.org)'
       '$(gitHubNotificationsRepoInfo.repo)'
       --repo-prefix '$(publishRepoPrefix)'

eng/common/templates/steps/publish-readmes.yml

@@ -9,7 +9,7 @@ steps:
     --registry-override '$(acr.server)'
     '$(mcrDocsRepoInfo.userName)'
     '$(mcrDocsRepoInfo.email)'
-    '$(mcrDocsRepoInfo.accessToken)'
+    $(mcrDocsRepoInfo.authArgs)
     '$(publicGitRepoUri)'
     ${{ parameters.dryRunArg }}
     $(manifestVariables)

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

@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2662183
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2703938
   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

eng/common/templates/variables/dotnet/build-test-publish.yml

@@ -14,21 +14,24 @@ variables:
 - name: officialRepoPrefixes
   value: public/,internal/private/,unlisted/
 
-- name: mcrDocsRepoInfo.accessToken
-  value: $(BotAccount-dotnet-docker-bot-PAT)
+- name: mcrDocsRepoInfo.authArgs
+  value: >-
+    --gh-private-key '$(GitHubApp-NET-Docker-MAR-Docs-Updater-PrivateKey)'
+    --gh-app-client-id '$(gitHubApp.marDocsUpdater.clientId)'
+    --gh-app-installation-id '$(gitHubApp.marDocsUpdater.microsoft.installationId)'
 - name: mcrDocsRepoInfo.userName
-  value: $(dotnetDockerBot.userName)
+  value: $(gitHubApp.marDocsUpdater.userName)
 - name: mcrDocsRepoInfo.email
-  value: $(dotnetDockerBot.email)
+  value: $(gitHubApp.marDocsUpdater.email)
 
 - name: publishNotificationsEnabled
   value: true
 - name: gitHubNotificationsRepoInfo.org
   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
@@ -38,8 +41,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