diff --git a/eng/docker-tools/templates/1es.yml b/eng/docker-tools/templates/1es.yml index 4056610e..c095fdfc 100644 --- a/eng/docker-tools/templates/1es.yml +++ b/eng/docker-tools/templates/1es.yml @@ -39,15 +39,13 @@ parameters: - name: enableSbom type: boolean default: false -# Network isolation policy that will be enabled for jobs. The default policy -# allows all outbound connections except for public package feeds and known -# malicious endpoints. If this policy breaks the build, then it can be set to -# "Permissive" temporarily until external dependencies are resolved. +# Network isolation policies that we will try to request. +# Some policies will always be enforced whether or not you put them here. # See the network isolation documentation for more details: # https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-build/cloudbuild/security/1espt-network-isolation - name: networkIsolationPolicy type: string - default: Permissive,CFSClean + default: DefaultDeny,CFSClean,CFSClean2 resources: repositories: diff --git a/eng/docker-tools/templates/stages/dotnet/publish.yml b/eng/docker-tools/templates/stages/dotnet/publish.yml index 3d51c199..f7eaba79 100644 --- a/eng/docker-tools/templates/stages/dotnet/publish.yml +++ b/eng/docker-tools/templates/stages/dotnet/publish.yml @@ -27,10 +27,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} isStandalonePublish: ${{ parameters.isStandalonePublish }} customInitSteps: ${{ parameters.customInitSteps }} - additionalServiceConnections: - - ${{ if variables['dotnetContainersBot.gitHubAuthArgs'] }}: - - name: DotnetContainersGitHubBot - - ${{ parameters.additionalServiceConnections }} + additionalServiceConnections: ${{ parameters.additionalServiceConnections }} sourceBuildPipelineDefinitionId: ${{ parameters.sourceBuildPipelineDefinitionId }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} versionsRepoRef: ${{ parameters.versionsRepoRef }} diff --git a/eng/docker-tools/templates/variables/docker-images.yml b/eng/docker-tools/templates/variables/docker-images.yml index ad48bda1..167c63c5 100644 --- a/eng/docker-tools/templates/variables/docker-images.yml +++ b/eng/docker-tools/templates/variables/docker-images.yml @@ -1,5 +1,5 @@ variables: - imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:4d4e1dd1e33a03684baa7fdeefd04d3788caaa22351fe54e743a4b0b57cba259 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:b19ba9028e33b582ca58e7a33400a1da7bba75961987d2e6879193ef44a06ce4 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner diff --git a/eng/pipelines/dotnet-framework-samples.yml b/eng/pipelines/dotnet-framework-samples.yml index d747611d..163a1414 100644 --- a/eng/pipelines/dotnet-framework-samples.yml +++ b/eng/pipelines/dotnet-framework-samples.yml @@ -52,3 +52,4 @@ extends: additionalServiceConnections: - name: $(kusto.serviceConnectionName) - name: $(marStatus.serviceConnectionName) + - name: DotnetContainersGitHubBot diff --git a/eng/pipelines/dotnet-framework.yml b/eng/pipelines/dotnet-framework.yml index 372931ea..7b8f95da 100644 --- a/eng/pipelines/dotnet-framework.yml +++ b/eng/pipelines/dotnet-framework.yml @@ -52,3 +52,4 @@ extends: additionalServiceConnections: - name: $(kusto.serviceConnectionName) - name: $(marStatus.serviceConnectionName) + - name: DotnetContainersGitHubBot