Skip to content

Commit ada13df

Browse files
[main] Update common Docker engineering infrastructure with latest (#5495)
1 parent d2d187f commit ada13df

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

eng/common/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:2456393
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2461919
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,3 @@ variables:
4444
value: $(dotnetDockerBot.userName)
4545
- name: gitHubVersionsRepoInfo.email
4646
value: $(dotnetDockerBot.email)
47-
48-
- name: kusto.servicePrincipalPassword
49-
value: $(app-DotnetDockerTelemetryIngestion-client-secret)
50-
- name: mcrStatus.servicePrincipalPassword
51-
value: $(app-DotnetDockerMcrStatusApi-client-secret)

eng/common/templates/variables/dotnet/common.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ variables:
66
value: internal
77
- name: dockerHubRegistryCreds
88
value: --registry-creds 'docker.io=$(dotnetDockerHubBot.userName);$(BotAccount-dotnet-dockerhub-bot-PAT)'
9-
- name: acr.servicePrincipalPassword
10-
value: $(app-dotnetdockerbuild-client-secret)
11-
- name: acr.password
12-
value: $(BotAccount-dotnet-docker-acr-bot-password)
139

1410
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
1511
- group: DotNet-Docker-Common
16-
- group: DotNet-Docker-Secrets
12+
- group: DotNet-Docker-Secrets-WIF

0 commit comments

Comments
 (0)