From a062f8878cc569a09044c9722b42ea77189233b5 Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Wed, 13 Nov 2024 19:20:15 +0100 Subject: [PATCH] Fix SBOM generation for squashfs --- .github/workflows/openwrt-2410-snapshot-build.yml | 4 +++- .github/workflows/openwrt-master-build.yml | 4 +++- .github/workflows/openwrt-stable-build.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml index 8157cbe..7c2bde8 100644 --- a/.github/workflows/openwrt-2410-snapshot-build.yml +++ b/.github/workflows/openwrt-2410-snapshot-build.yml @@ -169,7 +169,9 @@ jobs: echo $IMAGE # Mount volume - sudo mount /var/lib/docker/volumes/openwrt-docker_data/_data/$IMAGE /mnt + wget https://raw.githubusercontent.com/AlbrechtL/openwrt-docker/refs/heads/master/src/mount_openwrt_squashfs_combined.sh + chmod +x mount_openwrt_squashfs_combined.sh + sudo ./mount_openwrt_squashfs_combined.sh $IMAGE x86_64 $(arch) - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0 diff --git a/.github/workflows/openwrt-master-build.yml b/.github/workflows/openwrt-master-build.yml index d3338af..6812810 100644 --- a/.github/workflows/openwrt-master-build.yml +++ b/.github/workflows/openwrt-master-build.yml @@ -171,7 +171,9 @@ jobs: echo $IMAGE # Mount volume - sudo mount /var/lib/docker/volumes/openwrt-docker_data/_data/$IMAGE /mnt + wget https://raw.githubusercontent.com/AlbrechtL/openwrt-docker/refs/heads/master/src/mount_openwrt_squashfs_combined.sh + chmod +x mount_openwrt_squashfs_combined.sh + sudo ./mount_openwrt_squashfs_combined.sh $IMAGE x86_64 $(arch) - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0 diff --git a/.github/workflows/openwrt-stable-build.yml b/.github/workflows/openwrt-stable-build.yml index b81090c..3092ee9 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -165,7 +165,9 @@ jobs: echo $IMAGE # Mount volume - sudo mount /var/lib/docker/volumes/openwrt-docker_data/_data/$IMAGE /mnt + wget https://raw.githubusercontent.com/AlbrechtL/openwrt-docker/refs/heads/master/src/mount_openwrt_squashfs_combined.sh + chmod +x mount_openwrt_squashfs_combined.sh + sudo ./mount_openwrt_squashfs_combined.sh $IMAGE x86_64 $(arch) - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0