Skip to content

Commit

Permalink
Replace -latest docker tags with new schema
Browse files Browse the repository at this point in the history
We changed the latest tags to not include the -latest suffix, so this change updates those tags to the new schema.
  • Loading branch information
michellemcdaniel committed Sep 30, 2022
1 parent 81c1d10 commit f79f2d1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ stages:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
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:
--arch x64
--os-name linux-musl
Expand Down Expand Up @@ -562,7 +562,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
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:
--arch arm
--os-name linux-musl
Expand Down Expand Up @@ -596,7 +596,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
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:
--arch arm64
--os-name linux-musl
Expand Down Expand Up @@ -725,7 +725,7 @@ stages:
parameters:
platform:
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'
skipPublishValidation: true
jobProperties:
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/rhel.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 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
ARG USER
Expand Down
10 changes: 5 additions & 5 deletions eng/targets/Helix.Common.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<!-- This file is shared between Helix.proj and .csproj files. -->
<PropertyGroup>
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-latest</HelixQueueAlpine314>
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-latest</HelixQueueDebian11>
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-latest</HelixQueueFedora34>
<HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-latest</HelixQueueMariner>
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-latest</HelixQueueArmDebian11>
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64</HelixQueueAlpine314>
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
<HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>

<!-- Do not attempt to override global property. -->
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
Expand Down

0 comments on commit f79f2d1

Please sign in to comment.