From 0d3e768dbd3890260d6c94b19284e453ab9ba146 Mon Sep 17 00:00:00 2001
From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:40:09 -0700
Subject: [PATCH] Update common Docker engineering infrastructure with latest

---
 eng/common/templates/1es-official.yml            | 4 ++++
 eng/common/templates/1es-unofficial.yml          | 6 +++++-
 eng/common/templates/variables/docker-images.yml | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/eng/common/templates/1es-official.yml b/eng/common/templates/1es-official.yml
index 60091b72fd..69d1d4f353 100644
--- a/eng/common/templates/1es-official.yml
+++ b/eng/common/templates/1es-official.yml
@@ -46,9 +46,13 @@ extends:
         ignoreDirectories: $(Build.SourcesDirectory)/versions
         whatIf: ${{ parameters.cgDryRun }}
         showAlertLink: true
+      policheck:
+        enabled: true
       sourceRepositoriesToScan:
         exclude:
         - repository: InternalVersionsRepo
         - repository: PublicVersionsRepo
       sourceAnalysisPool: ${{ parameters.sourceAnalysisPool }}
+      tsa:
+        enabled: true
     stages: ${{ parameters.stages }}
diff --git a/eng/common/templates/1es-unofficial.yml b/eng/common/templates/1es-unofficial.yml
index 30faab0427..24ddeaff3d 100644
--- a/eng/common/templates/1es-unofficial.yml
+++ b/eng/common/templates/1es-unofficial.yml
@@ -45,11 +45,13 @@ extends:
   parameters:
     pool: ${{ parameters.pool }}
     sdl:
-      enableAllTools: ${{ not(parameters.disableSDL) }}
       componentgovernance:
         ignoreDirectories: $(Build.SourcesDirectory)/versions
         whatIf: true
         showAlertLink: true
+      enableAllTools: ${{ not(parameters.disableSDL) }}
+      policheck:
+        enabled: true
       sbom:
         enabled: true
       sourceRepositoriesToScan:
@@ -57,4 +59,6 @@ extends:
         - repository: InternalVersionsRepo
         - repository: PublicVersionsRepo
       sourceAnalysisPool: ${{ parameters.sourceAnalysisPool }}
+      tsa:
+        enabled: true
     stages: ${{ parameters.stages }}
diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
index fbd4544742..2ff5a9c02d 100644
--- a/eng/common/templates/variables/docker-images.yml
+++ b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2546747
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2552174
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner