Skip to content

Commit 297fa6d

Browse files
dotnet-docker-botlbussell
authored andcommitted
[nightly] Update common Docker engineering infrastructure with latest (dotnet#6914)
1 parent 0e8b9d3 commit 297fa6d

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
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 "/usr/share/.dotnet"
25+
./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "$(Build.SourcesDirectory)/.dotnet"
2626
displayName: Run Dotnet Install Script
2727
- script: >
28-
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build
28+
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 $(Build.SourcesDirectory)/.dotnet/dotnet build
2929
displayName: Build Projects
3030
3131
# Component Detection is only automatically run on production branches.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ stages:
5252
publishConfig:
5353
InternalMirrorRegistry:
5454
server: $(acr-staging-test.server)
55-
repoPrefix: $(mirrorRepoPrefix)
55+
repoPrefix: $(internalMirrorRepoPrefix)
5656
resourceGroup: $(testResourceGroup)
5757
subscription: $(testSubscription)
5858
serviceConnection:
@@ -63,6 +63,7 @@ stages:
6363

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ stages:
5252
publishConfig:
5353
InternalMirrorRegistry:
5454
server: $(acr-staging.server)
55-
repoPrefix: $(mirrorRepoPrefix)
55+
repoPrefix: $(internalMirrorRepoPrefix)
5656
resourceGroup: $(acr-staging.resourceGroup)
5757
subscription: $(acr-staging.subscription)
5858
serviceConnection:
@@ -63,7 +63,7 @@ stages:
6363

6464
PublicMirrorRegistry:
6565
server: $(public-mirror.server)
66-
repoPrefix: $(mirrorRepoPrefix)
66+
repoPrefix: $(publicMirrorRepoPrefix)
6767
resourceGroup: $(public-mirror.resourceGroup)
6868
subscription: $(public-mirror.subscription)
6969
serviceConnection:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ variables:
3333
- name: officialBranches
3434
# comma-delimited list of branch names
3535
value: main
36-
- name: mirrorRepoPrefix
36+
- name: internalMirrorRepoPrefix
3737
value: 'mirror/'
38+
- name: publicMirrorRepoPrefix
39+
value: ''
3840
- name: cgBuildGrepArgs
3941
value: "''"
4042
- name: test.init

0 commit comments

Comments
 (0)