Skip to content

Commit e885b73

Browse files
authored
Fix Linux CI to actually run inside a docker container (#574)
1 parent a862ccc commit e885b73

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.vsts-dotnet-ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
resources:
2-
containers:
3-
- container: centos7
4-
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416
5-
61
phases:
72
- template: /build/ci/phase-template.yml
83
parameters:
94
name: Linux
105
buildScript: ./build.sh
11-
queue:
12-
container: centos7
6+
dockerImage: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416
137

148
- template: /build/ci/phase-template.yml
159
parameters:

build/ci/phase-template.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
parameters:
22
name: ''
33
buildScript: ''
4+
dockerImage: ''
45
queue: {}
56

67
phases:
78
- phase: ${{ parameters.name }}
89
variables:
910
_buildScript: ${{ parameters.buildScript }}
1011
_phaseName: ${{ parameters.name }}
12+
# if dockerImage is not equal to '' then run under docker container
13+
${{ if ne(parameters.dockerImage, '') }}:
14+
_PREVIEW_VSTS_DOCKER_IMAGE: ${{ parameters.dockerImage }}
1115
queue:
1216
parallel: 2
1317
matrix:

0 commit comments

Comments
 (0)