Skip to content

Commit 90777da

Browse files
[release/6.0] Use simpler Docker tags (#45117)
- `cherry-pick` of 5f4bc82, Update docker tag to latest schema - This change moves all of the docker images to the -latest tag as part of #10377. - `cherry-pick` of f79f2d1, 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. - via #45115, w/ a slight adjustment from rhel-7 to centos-7 in rhel.Dockerfile nit: Correct timeout of source-build job - not honoured as a top-level parameter to source-build.yml Co-authored-by: Michelle McDaniel <[email protected]>
1 parent 9677da8 commit 90777da

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.azure/pipelines/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ stages:
610610
jobName: Linux_musl_x64_build
611611
jobDisplayName: "Build: Linux Musl x64"
612612
agentOs: Linux
613-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-20210910135833-c401c85
613+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
614614
buildArgs:
615615
--arch x64
616616
--os-name linux-musl
@@ -646,7 +646,7 @@ stages:
646646
jobDisplayName: "Build: Linux Musl ARM"
647647
agentOs: Linux
648648
useHostedUbuntu: false
649-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20211022152824-78f7860
649+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
650650
buildArgs:
651651
--arch arm
652652
--os-name linux-musl
@@ -681,7 +681,7 @@ stages:
681681
jobDisplayName: "Build: Linux Musl ARM64"
682682
agentOs: Linux
683683
useHostedUbuntu: false
684-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20211022152824-538077f
684+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
685685
buildArgs:
686686
--arch arm64
687687
--os-name linux-musl
@@ -817,9 +817,11 @@ stages:
817817
parameters:
818818
platform:
819819
name: 'Managed'
820-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2'
820+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
821821
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
822822
skipPublishValidation: true
823+
jobProperties:
824+
timeoutInMinutes: 120
823825

824826
# Publish to the BAR
825827
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

eng/docker/rhel.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile that creates a container suitable to build dotnet-cli
2-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
2+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
33

44
# Setup User to match Host User, and give superuser permissions
55
ARG USER

eng/targets/Helix.Common.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<!-- this file is shared between Helix.proj and .csproj files -->
33
<PropertyGroup>
4-
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
5-
<HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
6-
<HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
7-
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
8-
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
4+
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64</HelixQueueAlpine314>
5+
<HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
6+
<HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
7+
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
8+
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">

0 commit comments

Comments
 (0)