Skip to content

Commit 6e8cee9

Browse files
Add GHSA-gmc6-fwg3-75m5 to grype ignore list (#5114)
1 parent b91214c commit 6e8cee9

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/vuln-scans.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,12 @@ jobs:
156156
image: "otelcol:latest"
157157

158158
anchore-win-image-scan:
159-
runs-on: windows-2022
159+
runs-on: ${{ matrix.OS }}
160160
needs: [ "binaries-windows_amd64" ]
161+
strategy:
162+
matrix:
163+
OS: [ windows-2019, windows-2022 ]
164+
fail-fast: false
161165
env:
162166
PIP_CACHE_DIR: ${{ github.workspace }}/.cache/pip
163167
steps:
@@ -178,7 +182,12 @@ jobs:
178182
$ErrorActionPreference = 'Stop'
179183
Copy-Item .\bin\otelcol_windows_amd64.exe .\cmd\otelcol\otelcol.exe
180184
Copy-Item .\dist\agent-bundle_windows_amd64.zip .\cmd\otelcol\agent-bundle_windows_amd64.zip
181-
docker build -t otelcol-windows --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 --build-arg JMX_METRIC_GATHERER_RELEASE=$(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt) -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
185+
if ("${{ matrix.OS }}" -eq "windows-2019") {
186+
$base_image = "mcr.microsoft.com/windows/servercore:1809"
187+
} else {
188+
$base_image = "mcr.microsoft.com/windows/servercore:ltsc2022"
189+
}
190+
docker build -t otelcol-windows --pull --build-arg BASE_IMAGE=${base_image} --build-arg JMX_METRIC_GATHERER_RELEASE=$(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt) -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
182191
Remove-Item .\cmd\otelcol\otelcol.exe
183192
Remove-Item .\cmd\otelcol\agent-bundle_windows_amd64.zip
184193
- run: choco install -y grype

.grype.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ ignore:
1111
name: certifi
1212
version: 2023.7.22
1313
type: python
14+
# false positive: https://github.com/jstedfast/MimeKit/discussions/1054
15+
- vulnerability: GHSA-gmc6-fwg3-75m5
16+
package:
17+
name: MimeKit
18+
type: dotnet
19+
location: "**/MimeKitLite.dll"

0 commit comments

Comments
 (0)