Skip to content

Commit

Permalink
Use Microsoft Container Registry for docker images (dotnet/coreclr#23061
Browse files Browse the repository at this point in the history
)

* Use Microsoft Container Registry for docker images

https://github.com/dotnet/dotnet-buildtools-prereqs-docker has been updated to publish docker images to the Microsoft Container Registry.

* Also update netci.groovy


Commit migrated from dotnet/coreclr@1854201
  • Loading branch information
sbomer authored Mar 7, 2019
1 parent cb98885 commit bdcd6b8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions eng/pipelines/coreclr/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ variables:
resources:
containers:
- container: ubuntu_1404_arm_cross_build_image
image: microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-e435274-20180426002420
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-e435274-20180426002420

- container: ubuntu_1604_arm64_cross_build_image
image: microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921

- container: musl_x64_build_image
image: microsoft/dotnet-buildtools-prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247

- container: musl_arm64_build_image
image: microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-arm64-alpine10fcdcf-20190208200917
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine10fcdcf-20190208200917

- container: centos7_x64_build_image
image: microsoft/dotnet-buildtools-prereqs:centos-7-d485f41-20173404063424
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-d485f41-20173404063424

- container: centos6_x64_build_image
image: microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-376e1a3-20174311014331

trigger:
- master
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/netci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1197,12 +1197,12 @@ def static getDockerImageName(def architecture, def os, def isBuild) {
}
else if (architecture == 'arm') {
if (os == 'Ubuntu') {
return "microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-e435274-20180426002420"
return "mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-e435274-20180426002420"
}
}
else if (architecture == 'arm64') {
if (os == 'Ubuntu16.04') {
return "microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921"
return "mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921"
}
}
}
Expand Down

0 comments on commit bdcd6b8

Please sign in to comment.