فهرست منبع

Replace -latest docker tags with new schema

We changed the latest tags to not include the -latest suffix, so this change updates those tags to the new schema.
Michelle McDaniel 3 سال پیش
والد
کامیت
f79f2d1ca1
3فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 4 4
      .azure/pipelines/ci.yml
  2. 1 1
      eng/docker/rhel.Dockerfile
  3. 5 5
      eng/targets/Helix.Common.props

+ 4 - 4
.azure/pipelines/ci.yml

@@ -527,7 +527,7 @@ stages:
       jobName: Linux_musl_x64_build
       jobName: Linux_musl_x64_build
       jobDisplayName: "Build: Linux Musl x64"
       jobDisplayName: "Build: Linux Musl x64"
       agentOs: Linux
       agentOs: Linux
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-latest
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
       buildArgs:
       buildArgs:
         --arch x64
         --arch x64
         --os-name linux-musl
         --os-name linux-musl
@@ -562,7 +562,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM"
       jobDisplayName: "Build: Linux Musl ARM"
       agentOs: Linux
       agentOs: Linux
       useHostedUbuntu: false
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-latest
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
       buildArgs:
       buildArgs:
         --arch arm
         --arch arm
         --os-name linux-musl
         --os-name linux-musl
@@ -596,7 +596,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM64"
       jobDisplayName: "Build: Linux Musl ARM64"
       agentOs: Linux
       agentOs: Linux
       useHostedUbuntu: false
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-latest
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
       buildArgs:
       buildArgs:
         --arch arm64
         --arch arm64
         --os-name linux-musl
         --os-name linux-musl
@@ -725,7 +725,7 @@ stages:
     parameters:
     parameters:
       platform:
       platform:
         name: 'Managed'
         name: 'Managed'
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-latest'
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
         buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
         buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
         skipPublishValidation: true
         skipPublishValidation: true
         jobProperties:
         jobProperties:

+ 1 - 1
eng/docker/rhel.Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile that creates a container suitable to build dotnet-cli
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-latest
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
 
 
 # Setup User to match Host User, and give superuser permissions
 # Setup User to match Host User, and give superuser permissions
 ARG USER
 ARG USER

+ 5 - 5
eng/targets/Helix.Common.props

@@ -1,11 +1,11 @@
 <Project>
 <Project>
   <!-- This file is shared between Helix.proj and .csproj files. -->
   <!-- This file is shared between Helix.proj and .csproj files. -->
   <PropertyGroup>
   <PropertyGroup>
-    <HelixQueueAlpine314>(Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-latest</HelixQueueAlpine314>
-    <HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-latest</HelixQueueDebian11>
-    <HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-latest</HelixQueueFedora34>
-    <HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-latest</HelixQueueMariner>
-    <HelixQueueArmDebian11>(Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-latest</HelixQueueArmDebian11>
+    <HelixQueueAlpine314>(Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64</HelixQueueAlpine314>
+    <HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
+    <HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
+    <HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
+    <HelixQueueArmDebian11>(Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
 
 
     <!-- Do not attempt to override global property. -->
     <!-- Do not attempt to override global property. -->
     <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
     <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>