From 58a18cf958883c6a67ae888854bd9bb09f085e83 Mon Sep 17 00:00:00 2001
From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
Date: Wed, 29 May 2024 08:12:16 -0500
Subject: [PATCH] [main] Update common Docker engineering infrastructure with
 latest (#1131)

---
 eng/common/templates/variables/docker-images.yml            | 2 +-
 .../templates/variables/dotnet/build-test-publish.yml       | 5 -----
 eng/common/templates/variables/dotnet/common.yml            | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
index c11507bf..8a52894e 100644
--- a/eng/common/templates/variables/docker-images.yml
+++ b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2456393
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2461919
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner
diff --git a/eng/common/templates/variables/dotnet/build-test-publish.yml b/eng/common/templates/variables/dotnet/build-test-publish.yml
index a3b62910..51e5dde3 100644
--- a/eng/common/templates/variables/dotnet/build-test-publish.yml
+++ b/eng/common/templates/variables/dotnet/build-test-publish.yml
@@ -44,8 +44,3 @@ variables:
   value: $(dotnetDockerBot.userName)
 - name: gitHubVersionsRepoInfo.email
   value: $(dotnetDockerBot.email)
-
-- name: kusto.servicePrincipalPassword
-  value: $(app-DotnetDockerTelemetryIngestion-client-secret)
-- name: mcrStatus.servicePrincipalPassword
-  value: $(app-DotnetDockerMcrStatusApi-client-secret)
diff --git a/eng/common/templates/variables/dotnet/common.yml b/eng/common/templates/variables/dotnet/common.yml
index d0c151c5..f28ce7f9 100644
--- a/eng/common/templates/variables/dotnet/common.yml
+++ b/eng/common/templates/variables/dotnet/common.yml
@@ -6,11 +6,7 @@ variables:
   value: internal
 - name: dockerHubRegistryCreds
   value: --registry-creds 'docker.io=$(dotnetDockerHubBot.userName);$(BotAccount-dotnet-dockerhub-bot-PAT)'
-- name: acr.servicePrincipalPassword
-  value: $(app-dotnetdockerbuild-client-secret)
-- name: acr.password
-  value: $(BotAccount-dotnet-docker-acr-bot-password)
 
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - group: DotNet-Docker-Common
-  - group: DotNet-Docker-Secrets
+  - group: DotNet-Docker-Secrets-WIF