Skip to content
代码片段 群组 项目
未验证 提交 26e3dfc7 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

[release/7.0] Use simpler Docker tags (#45115)


* [release/7.0] Use simpler Docker tags
- `cherry-pick` of 5f4bc82d, 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 f79f2d1c, 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.

nit: Correct timeout of source-build job
- not honoured as a top-level parameter to source-build.yml

* !fixup! Use rh-ruby26

Co-authored-by: default avatarMichelle McDaniel <michelm@microsoft.com>
上级 0384a80e
No related branches found
No related tags found
无相关合并请求
...@@ -595,7 +595,7 @@ stages: ...@@ -595,7 +595,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-20210910135833-c401c85 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
...@@ -631,7 +631,7 @@ stages: ...@@ -631,7 +631,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-20211022152824-78f7860 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
...@@ -666,7 +666,7 @@ stages: ...@@ -666,7 +666,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-20211022152824-538077f 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
...@@ -796,10 +796,11 @@ stages: ...@@ -796,10 +796,11 @@ stages:
parameters: parameters:
platform: platform:
name: 'Managed' name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true skipPublishValidation: true
timeoutInMinutes: 120 jobProperties:
timeoutInMinutes: 120
# Publish to the BAR and perform source indexing. Wait until everything else is done. # Publish to the BAR and perform source indexing. Wait until everything else is done.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
......
# 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-20220505130359-d0fa36f 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
......
<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)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314> <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-20211001171307-0ece9b3</HelixQueueDebian11> <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-20210924174119-4f64125</HelixQueueFedora34> <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-20210528192219-92bf620</HelixQueueMariner> <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-20211001171229-97d8652</HelixQueueArmDebian11> <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. --> <!-- Do not attempt to override global property. -->
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests> <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" /> <FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" />
</ItemGroup> </ItemGroup>
<Exec Command="scl enable rh-ruby25 'fpm @(FpmArgs,' ')'" /> <Exec Command="scl enable rh-ruby26 'fpm @(FpmArgs,' ')'" />
<Copy SourceFiles="$(TargetPath)" <Copy SourceFiles="$(TargetPath)"
DestinationFiles="$(CblMariner1TargetPath)" DestinationFiles="$(CblMariner1TargetPath)"
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册