Skip to content

Commit 05f94eb

Browse files
[nightly] Update common Docker engineering infrastructure with latest (#6913)
1 parent a6f9c43 commit 05f94eb

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

eng/docker-tools/templates/jobs/cg-build-projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
os: linux
2323
steps:
2424
- powershell: >
25-
./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "$(Build.SourcesDirectory)/.dotnet"
25+
./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet"
2626
displayName: Run Dotnet Install Script
2727
- script: >
28-
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 $(Build.SourcesDirectory)/.dotnet/dotnet build
28+
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build
2929
displayName: Build Projects
3030
3131
# Component Detection is only automatically run on production branches.

eng/docker-tools/templates/jobs/copy-base-images-staging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
parameters:
2424
name: ${{ parameters.name }}
2525
pool: ${{ parameters.pool }}
26+
publishConfig: ${{ parameters.publishConfig }}
2627
customInitSteps: ${{ parameters.customInitSteps }}
2728
additionalOptions: ${{ parameters.additionalOptions }}
2829
acr: ${{ parameters.publishConfig.InternalMirrorRegistry }}

eng/docker-tools/templates/jobs/copy-base-images.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ parameters:
55
- name: pool
66
type: object
77
default: {}
8+
- name: publishConfig
9+
type: object
10+
default: null
811
- name: acr
912
type: object
1013
default: null
@@ -26,6 +29,8 @@ jobs:
2629
pool: ${{ parameters.pool }}
2730
steps:
2831
- template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
32+
parameters:
33+
publishConfig: ${{ parameters.publishConfig }}
2934
- ${{ parameters.customInitSteps }}
3035
- template: /eng/docker-tools/templates/steps/copy-base-images.yml@self
3136
parameters:

eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ stages:
6363

6464
PublicMirrorRegistry:
6565
server: $(public-mirror.server)
66+
repoPrefix: $(mirrorRepoPrefix)
6667
resourceGroup: $(public-mirror.resourceGroup)
6768
subscription: $(public-mirror.subscription)
6869
serviceConnection:

0 commit comments

Comments
 (0)