luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: scan docker image for SBOM instead of extracted squashfs-root 

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
This commit is contained in:
Darryl L. Miles 2026-07-20 17:14:36 +01:00 committed by R. Timothy Edwards
parent b0ba9db6a4
commit e438838725
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/appimage10.yml vendored
View File

@ -306,11 +306,6 @@ jobs:
cd appimage/10 cd appimage/10
make validate make validate
- name: Extract AppImage for SBOM scan
run: |
cd appimage/10
./${MAGIC_APPIMAGE_OUTPUT_FILENAME} --appimage-extract
- name: Create RELEASE-NOTES.txt - name: Create RELEASE-NOTES.txt
run: | run: |
cd appimage/10 cd appimage/10
@ -406,7 +401,7 @@ jobs:
- name: Generate SBOM - name: Generate SBOM
uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0 uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
with: with:
path: ${{ github.workspace }}/appimage/10/squashfs-root image: docker:magic_build
format: spdx-json format: spdx-json
output-file: ${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false upload-artifact: false

7
.github/workflows/appimage7.yml vendored
View File

@ -306,11 +306,6 @@ jobs:
cd appimage/7 cd appimage/7
make validate make validate
- name: Extract AppImage for SBOM scan
run: |
cd appimage/7
./${MAGIC_APPIMAGE_OUTPUT_FILENAME} --appimage-extract
- name: Create RELEASE-NOTES.txt - name: Create RELEASE-NOTES.txt
run: | run: |
cd appimage/7 cd appimage/7
@ -406,7 +401,7 @@ jobs:
- name: Generate SBOM - name: Generate SBOM
uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0 uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
with: with:
path: ${{ github.workspace }}/appimage/7/squashfs-root image: docker:magic_build
format: spdx-json format: spdx-json
output-file: ${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false upload-artifact: false

7
.github/workflows/appimage8.yml vendored
View File

@ -306,11 +306,6 @@ jobs:
cd appimage/8 cd appimage/8
make validate make validate
- name: Extract AppImage for SBOM scan
run: |
cd appimage/8
./${MAGIC_APPIMAGE_OUTPUT_FILENAME} --appimage-extract
- name: Create RELEASE-NOTES.txt - name: Create RELEASE-NOTES.txt
run: | run: |
cd appimage/8 cd appimage/8
@ -406,7 +401,7 @@ jobs:
- name: Generate SBOM - name: Generate SBOM
uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0 uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
with: with:
path: ${{ github.workspace }}/appimage/8/squashfs-root image: docker:magic_build
format: spdx-json format: spdx-json
output-file: ${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false upload-artifact: false

7
.github/workflows/appimage9.yml vendored
View File

@ -306,11 +306,6 @@ jobs:
cd appimage/9 cd appimage/9
make validate make validate
- name: Extract AppImage for SBOM scan
run: |
cd appimage/9
./${MAGIC_APPIMAGE_OUTPUT_FILENAME} --appimage-extract
- name: Create RELEASE-NOTES.txt - name: Create RELEASE-NOTES.txt
run: | run: |
cd appimage/9 cd appimage/9
@ -406,7 +401,7 @@ jobs:
- name: Generate SBOM - name: Generate SBOM
uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0 uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
with: with:
path: ${{ github.workspace }}/appimage/9/squashfs-root image: docker:magic_build
format: spdx-json format: spdx-json
output-file: ${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false upload-artifact: false