Skip to content

Commit 7e3ff8a

Browse files
authored
Fix component governance and sbom generation (#1089)
* update docker images list in sbom generation and component governance
1 parent 45fa343 commit 7e3ff8a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.pipelines/azure_pipeline_mergedbranches.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,24 +171,24 @@ jobs:
171171
condition: eq(variables.IS_PR, true)
172172
inputs:
173173
BuildDropPath: '$(Build.ArtifactStagingDirectory)/linux'
174-
DockerImagesToScan: '$(GOLANG_BASE_IMAGE), $(CI_BASE_IMAGE)'
174+
DockerImagesToScan: '$(GOLANG_BASE_IMAGE),$(CI_BASE_IMAGE)'
175175

176176
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
177177
displayName: 'Generation Task'
178178
condition: eq(variables.IS_PR, false)
179179
inputs:
180180
BuildDropPath: '$(Build.ArtifactStagingDirectory)/linux'
181-
DockerImagesToScan: '$(GOLANG_BASE_IMAGE), $(CI_BASE_IMAGE), ${{ variables.repoImageName }}:$(linuxImagetag)'
181+
DockerImagesToScan: '$(GOLANG_BASE_IMAGE),$(CI_BASE_IMAGE),${{ variables.repoImageName }}:$(linuxImagetag)'
182182

183183
- task: ComponentGovernanceComponentDetection@0
184184
condition: eq(variables.IS_PR, true)
185185
inputs:
186-
DockerImagesToScan: '$(GOLANG_BASE_IMAGE), $(CI_BASE_IMAGE)'
186+
DockerImagesToScan: '$(GOLANG_BASE_IMAGE),$(CI_BASE_IMAGE)'
187187

188188
- task: ComponentGovernanceComponentDetection@0
189189
condition: eq(variables.IS_PR, false)
190190
inputs:
191-
DockerImagesToScan: '$(GOLANG_BASE_IMAGE), $(CI_BASE_IMAGE), ${{ variables.repoImageName }}:$(linuxImagetag)'
191+
DockerImagesToScan: '$(GOLANG_BASE_IMAGE),$(CI_BASE_IMAGE),${{ variables.repoImageName }}:$(linuxImagetag)'
192192

193193
- task: PublishBuildArtifacts@1
194194
inputs:
@@ -326,14 +326,14 @@ jobs:
326326
condition: eq(variables.IS_PR, true)
327327
inputs:
328328
BuildDropPath: '$(Build.ArtifactStagingDirectory)/windows'
329-
DockerImagesToScan: 'mcr.microsoft.com/windows/servercore:ltsc2019, mcr.microsoft.com/windows/servercore:ltsc2022'
329+
DockerImagesToScan: 'mcr.microsoft.com/windows/servercore:ltsc2019,mcr.microsoft.com/windows/servercore:ltsc2022'
330330

331331
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
332332
displayName: 'Generation Task'
333333
condition: eq(variables.IS_PR, false)
334334
inputs:
335335
BuildDropPath: '$(Build.ArtifactStagingDirectory)/windows'
336-
DockerImagesToScan: 'mcr.microsoft.com/windows/servercore:ltsc2019, mcr.microsoft.com/windows/servercore:ltsc2022, ${{ variables.repoImageName }}:$(windowsImageTag)'
336+
DockerImagesToScan: 'mcr.microsoft.com/windows/servercore:ltsc2019,mcr.microsoft.com/windows/servercore:ltsc2022,${{ variables.repoImageName }}:$(windowsImageTag)'
337337
- task: PublishBuildArtifacts@1
338338
inputs:
339339
pathToPublish: '$(Build.ArtifactStagingDirectory)'

0 commit comments

Comments
 (0)