diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml index bd30ad7..cb0469a 100644 --- a/.github/workflows/openwrt-2410-snapshot-build.yml +++ b/.github/workflows/openwrt-2410-snapshot-build.yml @@ -171,7 +171,10 @@ jobs: # Mount volume 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 "/var/lib/docker/volumes/${IMAGE}" $(arch) + sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) + + # Double check if OpenWrt rootfs is mounted + [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - 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 5972d5f..0ae1958 100644 --- a/.github/workflows/openwrt-master-build.yml +++ b/.github/workflows/openwrt-master-build.yml @@ -173,7 +173,10 @@ jobs: # Mount volume 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 "/var/lib/docker/volumes/${IMAGE}" $(arch) + sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) + + # Double check if OpenWrt rootfs is mounted + [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - 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 de36ae4..bc63bc5 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -167,7 +167,10 @@ jobs: # Mount volume 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 "/var/lib/docker/volumes/${IMAGE}" $(arch) + sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) + + # Double check if OpenWrt rootfs is mounted + [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0