Skip to content

Commit 56cdefd

Browse files
Update common Docker engineering infrastructure with latest
1 parent fe55a65 commit 56cdefd

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

eng/common/templates/1es.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ parameters:
3232
name: $(defaultSourceAnalysisPoolName)
3333
image: $(defaultSourceAnalysisPoolImage)
3434
os: windows
35+
# Container image SBOMs are generated manually during the build job. 1ESPT's
36+
# automatic SBOM generation only adds unnecessary steps and artifacts to
37+
# builds. SBOM is not needed for JSON outputs. If a pipeline outputs binary
38+
# artifacts that ship to customers, then set this parameter to true.
39+
- name: enableSbom
40+
type: boolean
41+
default: false
3542

3643
resources:
3744
repositories:
@@ -47,10 +54,8 @@ extends:
4754
templateParameters:
4855
pool: ${{ parameters.pool }}
4956
sdl:
50-
# Required for unofficial pipelines because we rely on the ManifestGeneratorTask that is
51-
# automatically installed by 1ES pipeline templates
5257
sbom:
53-
enabled: true
58+
enabled: ${{ parameters.enableSbom }}
5459
binskim:
5560
enabled: true
5661
componentgovernance:

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:2786011
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2789747
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

0 commit comments

Comments
 (0)