Skip to content

Commit bcbf2be

Browse files
authored
Merge pull request #532 from sir-gon/security
Security
2 parents a4e48b1 + f39722a commit bcbf2be

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

.github/workflows/docker-image.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
with:
158158
sarif_file: 'snyk.sarif'
159159
scan:
160-
name: "Trivy"
160+
name: "Trivy (sarif)"
161161
runs-on: ubuntu-latest
162162
needs: build
163163
permissions:
@@ -187,3 +187,25 @@ jobs:
187187
uses: github/codeql-action/upload-sarif@v3
188188
with:
189189
sarif_file: 'trivy-results.sarif'
190+
191+
report:
192+
name: "Trivy (report)"
193+
runs-on: ubuntu-latest
194+
needs: build
195+
steps:
196+
- name: Download artifact
197+
uses: actions/download-artifact@v4
198+
with:
199+
name: ${{ env.ARTIFACT_NAME }}_prod
200+
path: /tmp/
201+
202+
- name: Load image
203+
run: |
204+
docker load --input /tmp/${{ env.ARTIFACT_NAME }}_prod.tar
205+
docker image ls -a
206+
207+
- name: Run Trivy vulnerability scanner
208+
uses: aquasecurity/[email protected]
209+
with:
210+
image-ref: ${{ env.IMAGE_NAME }}:${{ github.sha }}
211+
format: 'table'

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ pylint==3.2.5
1919
pyright==1.1.372
2020
pytest==8.2.2
2121
pytest-cov==5.0.0
22+
setuptools==71.0.4 # not directly required, pinned by Snyk to avoid a vulnerability
2223
tomli==2.0.1
2324
tomlkit==0.13.0
2425
typing_extensions==4.12.2
2526
wrapt==1.16.0
26-
setuptools>=70.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
2727
zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability

0 commit comments

Comments
 (0)