Skip to content

Commit 1a88de0

Browse files
[main] Update common Docker engineering infrastructure with latest (#4965)
1 parent 32301c7 commit 1a88de0

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

eng/common/templates/jobs/cg-detection.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ jobs:
33
pool:
44
vmImage: $(defaultLinuxAmd64PoolImage)
55
steps:
6+
- powershell: >
7+
./eng/common/Install-DotNetSdk.ps1 /usr/share/.dotnet
8+
displayName: Run Dotnet Install Script
69
- task: CodeQL3000Init@0
710
displayName: CodeQL Initialize
811
- script: >
9-
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 dotnet build
12+
find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build
1013
displayName: Build Projects
1114
- task: CodeQL3000Finalize@0
1215
displayName: CodeQL Finalize

eng/common/templates/steps/test-images-linux-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ steps:
3333
docker run -t -d
3434
-v /var/run/docker.sock:/var/run/docker.sock
3535
-v $(Build.ArtifactStagingDirectory):$(artifactsPath)
36-
-e RUNNING_TESTS_IN_CONTAINER=true
3736
-e DOCKER_BUILDKIT=1
37+
-e RUNNING_TESTS_IN_CONTAINER=true
3838
--name $(testRunner.container)
3939
$(imageNames.testRunner.withrepo)
4040
displayName: Start Test Runner Container

eng/common/templates/variables/docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2296361
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2299130
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner

0 commit comments

Comments
 (0)