Skip to content

Commit 29a9c90

Browse files
authored
Use native support for docker containers in build steps (#53471)
* Remove usage of dockerbuild.sh * Fixup * Fix containers * Update compat to 10
1 parent a45d4d3 commit 29a9c90

File tree

2 files changed

+52
-20
lines changed
  • .azure/pipelines
  • src/Installers/Debian/tools/package_files/debian

2 files changed

+52
-20
lines changed

.azure/pipelines/ci.yml

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ variables:
154154
value: false
155155
- template: /eng/common/templates/variables/pool-providers.yml
156156

157+
resources:
158+
containers:
159+
- container: debpkg
160+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
161+
162+
- container: rpmpkg
163+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
164+
157165
stages:
158166
- stage: build
159167
displayName: Build
@@ -428,20 +436,36 @@ stages:
428436
$(_BuildArgs)
429437
$(_InternalRuntimeDownloadArgs)
430438
displayName: Run build.sh
431-
- script: git clean -xfd src/**/obj/;
432-
./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
433-
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=deb
434-
$(_BuildArgs)
435-
$(_InternalRuntimeDownloadArgs)
439+
- script: ./eng/build.sh
440+
--ci
441+
--nobl
442+
--arch x64
443+
--build-installers
444+
--no-build-deps
445+
--no-build-nodejs
446+
-p:OnlyPackPlatformSpecificPackages=true
447+
-p:BuildRuntimeArchive=false
448+
-p:LinuxInstallerType=deb
449+
$(_BuildArgs)
450+
$(_InternalRuntimeDownloadArgs)
436451
displayName: Build Debian installers
437-
- script: git clean -xfd src/**/obj/;
438-
./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
439-
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
440-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
441-
$(_BuildArgs)
442-
$(_PublishArgs)
443-
$(_InternalRuntimeDownloadArgs)
452+
target: debpkg
453+
- script: ./eng/build.sh
454+
--ci
455+
--nobl
456+
--arch x64
457+
--build-installers
458+
--no-build-deps
459+
--no-build-nodejs
460+
-p:OnlyPackPlatformSpecificPackages=true
461+
-p:BuildRuntimeArchive=false
462+
-p:LinuxInstallerType=rpm
463+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
464+
$(_BuildArgs)
465+
$(_PublishArgs)
466+
$(_InternalRuntimeDownloadArgs)
444467
displayName: Build RPM installers
468+
target: rpmpkg
445469
artifacts:
446470
- name: Linux_x64_Logs
447471
path: artifacts/log/
@@ -501,14 +525,22 @@ stages:
501525
$(_BuildArgs)
502526
$(_InternalRuntimeDownloadArgs)
503527
displayName: Run build.sh
504-
- script: git clean -xfd src/**/obj/;
505-
./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs
506-
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
507-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
508-
$(_BuildArgs)
509-
$(_PublishArgs)
510-
$(_InternalRuntimeDownloadArgs)
528+
- script: ./eng/build.sh
529+
--ci
530+
--nobl
531+
--arch arm64
532+
--build-installers
533+
--no-build-deps
534+
--no-build-nodejs
535+
-p:OnlyPackPlatformSpecificPackages=true
536+
-p:BuildRuntimeArchive=false
537+
-p:LinuxInstallerType=rpm
538+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
539+
$(_BuildArgs)
540+
$(_PublishArgs)
541+
$(_InternalRuntimeDownloadArgs)
511542
displayName: Build RPM installers
543+
target: rpmpkg
512544
artifacts:
513545
- name: Linux_arm64_Logs
514546
path: artifacts/log/
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9
1+
10

0 commit comments

Comments
 (0)