Skip to content

Commit 7f6147d

Browse files
author
John Luo
authored
Use containers instead of dockerbuild.sh (#23497)
1 parent a4dd539 commit 7f6147d

File tree

4 files changed

+6
-49
lines changed

4 files changed

+6
-49
lines changed

.azure/pipelines/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ stages:
433433
jobName: Linux_musl_x64_build
434434
jobDisplayName: "Build: Linux Musl x64"
435435
agentOs: Linux
436-
buildScript: ./dockerbuild.sh alpine
436+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
437+
buildScript: ./build.sh
437438
buildArgs:
438439
--arch x64
439440
--os-name linux-musl
@@ -466,7 +467,8 @@ stages:
466467
jobDisplayName: "Build: Linux Musl ARM64"
467468
agentOs: Linux
468469
useHostedUbuntu: false
469-
buildScript: ./dockerbuild.sh ubuntu-alpine37
470+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
471+
buildScript: ./build.sh
470472
buildArgs:
471473
--arch arm64
472474
--os-name linux-musl

.azure/pipelines/jobs/default-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ jobs:
114114
name: NetCoreInternal-Pool
115115
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
116116
queue: BuildPool.Server.Amd64.VS2019
117+
${{ if ne(parameters.container, '') }}:
118+
container: ${{ parameters.container }}
117119
variables:
118120
- AgentOsName: ${{ parameters.agentOs }}
119121
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping

eng/docker/alpine.Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

eng/docker/ubuntu-alpine37.Dockerfile

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)