mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use latest docker containers (#14645)

Browse source 
* Use latest docker containers

This change moves all of the docker images to the latest tag as part of https://github.com/dotnet/arcade/issues/10377.

* Change source build tarball leg to fedora-36 container
This commit is contained in:
Michelle McDaniel 2022-10-04 15:07:04 -07:00 committed by GitHub
parent 403acd7313
commit d552037815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View file

@ -2,7 +2,7 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet // https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet
{ {
"name": "Source-Build w/ Built Tarball", "name": "Source-Build w/ Built Tarball",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2", "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
// A completely built .NET source-tarball is >64 GB // A completely built .NET source-tarball is >64 GB
"hostRequirements": { "hostRequirements": {
"storage": "128gb" "storage": "128gb"

2
.devcontainer/source-build-tarball/devcontainer.json
View file

@ -2,7 +2,7 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet // https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet
{ {
"name": "Source-Build w/ Tarball", "name": "Source-Build w/ Tarball",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2", "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
// A completely built .NET source tarball is >64 GB // A completely built .NET source tarball is >64 GB
"hostRequirements": { "hostRequirements": {
"storage": "128gb" "storage": "128gb"

2
.devcontainer/source-build/devcontainer.json
View file

@ -1,5 +1,5 @@
// Use this devcontainer if you don't need the full context of a source-build tarball // Use this devcontainer if you don't need the full context of a source-build tarball
{ {
"name": "Source-Build", "name": "Source-Build",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2" "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36"
} }

20
.vsts-ci.yml
View file

@ -73,7 +73,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Ubuntu_18_04_Debug_x64 jobName: Build_Ubuntu_18_04_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20220916154732-3c53da6' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
@ -82,7 +82,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Fedora_36_Debug_x64 jobName: Build_Fedora_36_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220912173100-a09384f' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
@ -91,7 +91,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_CentOS_7_Debug_x64 jobName: Build_CentOS_7_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20220912172913-d16db59' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: false linuxPortable: false
@ -100,7 +100,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Debian_Stretch_Debug_x64 jobName: Build_Debian_Stretch_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20220912173009-94fc78a' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
additionalBuildParameters: '/p:BuildSdkDeb=true' additionalBuildParameters: '/p:BuildSdkDeb=true'
@ -120,7 +120,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Debug_x64 jobName: Build_Linux_musl_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode-20220916182008-f0ea7ba' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
runtimeIdentifier: 'linux-musl-x64' runtimeIdentifier: 'linux-musl-x64'
@ -200,7 +200,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Release_arm jobName: Build_Linux_musl_Release_arm
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-20220916154619-56ef508' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm' runtimeIdentifier: 'linux-musl-arm'
@ -221,7 +221,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Release_x64 jobName: Build_Linux_musl_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode-20220916182008-f0ea7ba' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x64 buildArchitecture: x64
runtimeIdentifier: 'linux-musl-x64' runtimeIdentifier: 'linux-musl-x64'
@ -233,7 +233,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_Portable_Deb_Release_x64 jobName: Build_Linux_Portable_Deb_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220916154732-cfdd435' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x64 buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are # Do not publish zips and tarballs. The linux-x64 binaries are
@ -245,7 +245,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_x64 jobName: Build_Linux_Portable_Rpm_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220912172913-d0fa36f' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x64 buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are # Do not publish zips and tarballs. The linux-x64 binaries are
@ -257,7 +257,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_Arm64 jobName: Build_Linux_Portable_Rpm_Release_Arm64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220912172913-d0fa36f' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm64 buildArchitecture: arm64
runtimeIdentifier: 'linux-arm64' runtimeIdentifier: 'linux-arm64'

2
src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file

@ -2,7 +2,7 @@
jobs: jobs:
- job: Source_Build_Create_Tarball - job: Source_Build_Create_Tarball
container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36
displayName: Source-Build Create Tarball displayName: Source-Build Create Tarball
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:

10
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

@ -12,11 +12,11 @@ parameters:
# The following parameters aren't expected to be passed in rather they are used for encapsulation # The following parameters aren't expected to be passed in rather they are used for encapsulation
# ----------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8-20220812185233-b286fae debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220818134137-a09384f fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36
ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
poolInternalAmd64: poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64