Skip to content

Commit d552037

Browse files
Use latest docker containers (#14645)
* 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
1 parent 403acd7 commit d552037

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet
33
{
44
"name": "Source-Build w/ Built Tarball",
5-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2",
5+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
66
// A completely built .NET source-tarball is >64 GB
77
"hostRequirements": {
88
"storage": "128gb"

.devcontainer/source-build-tarball/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet
33
{
44
"name": "Source-Build w/ Tarball",
5-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2",
5+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
66
// A completely built .NET source tarball is >64 GB
77
"hostRequirements": {
88
"storage": "128gb"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Use this devcontainer if you don't need the full context of a source-build tarball
22
{
33
"name": "Source-Build",
4-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2"
4+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36"
55
}

.vsts-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
parameters:
7474
agentOs: Linux
7575
jobName: Build_Ubuntu_18_04_Debug_x64
76-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20220916154732-3c53da6'
76+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04'
7777
buildConfiguration: Debug
7878
buildArchitecture: x64
7979
linuxPortable: true
@@ -82,7 +82,7 @@ stages:
8282
parameters:
8383
agentOs: Linux
8484
jobName: Build_Fedora_36_Debug_x64
85-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220912173100-a09384f'
85+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
8686
buildConfiguration: Debug
8787
buildArchitecture: x64
8888
linuxPortable: true
@@ -91,7 +91,7 @@ stages:
9191
parameters:
9292
agentOs: Linux
9393
jobName: Build_CentOS_7_Debug_x64
94-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20220912172913-d16db59'
94+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
9595
buildConfiguration: Debug
9696
buildArchitecture: x64
9797
linuxPortable: false
@@ -100,7 +100,7 @@ stages:
100100
parameters:
101101
agentOs: Linux
102102
jobName: Build_Debian_Stretch_Debug_x64
103-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20220912173009-94fc78a'
103+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch'
104104
buildConfiguration: Debug
105105
buildArchitecture: x64
106106
additionalBuildParameters: '/p:BuildSdkDeb=true'
@@ -120,7 +120,7 @@ stages:
120120
parameters:
121121
agentOs: Linux
122122
jobName: Build_Linux_musl_Debug_x64
123-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode-20220916182008-f0ea7ba'
123+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode'
124124
buildConfiguration: Debug
125125
buildArchitecture: x64
126126
runtimeIdentifier: 'linux-musl-x64'
@@ -200,7 +200,7 @@ stages:
200200
parameters:
201201
agentOs: Linux
202202
jobName: Build_Linux_musl_Release_arm
203-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-20220916154619-56ef508'
203+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross'
204204
buildConfiguration: Release
205205
buildArchitecture: arm
206206
runtimeIdentifier: 'linux-musl-arm'
@@ -221,7 +221,7 @@ stages:
221221
parameters:
222222
agentOs: Linux
223223
jobName: Build_Linux_musl_Release_x64
224-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode-20220916182008-f0ea7ba'
224+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode'
225225
buildConfiguration: Release
226226
buildArchitecture: x64
227227
runtimeIdentifier: 'linux-musl-x64'
@@ -233,7 +233,7 @@ stages:
233233
parameters:
234234
agentOs: Linux
235235
jobName: Build_Linux_Portable_Deb_Release_x64
236-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220916154732-cfdd435'
236+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg'
237237
buildConfiguration: Release
238238
buildArchitecture: x64
239239
# Do not publish zips and tarballs. The linux-x64 binaries are
@@ -245,7 +245,7 @@ stages:
245245
parameters:
246246
agentOs: Linux
247247
jobName: Build_Linux_Portable_Rpm_Release_x64
248-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220912172913-d0fa36f'
248+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg'
249249
buildConfiguration: Release
250250
buildArchitecture: x64
251251
# Do not publish zips and tarballs. The linux-x64 binaries are
@@ -257,7 +257,7 @@ stages:
257257
parameters:
258258
agentOs: Linux
259259
jobName: Build_Linux_Portable_Rpm_Release_Arm64
260-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220912172913-d0fa36f'
260+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg'
261261
buildConfiguration: Release
262262
buildArchitecture: arm64
263263
runtimeIdentifier: 'linux-arm64'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ parameters:
1212

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

0 commit comments

Comments
 (0)