Fix wrong SBOM generation for snapshots

AlbrechtL · Nov 27, 2024 · 3ccc1e4 · 3ccc1e4
1 parent d85d3cf
commit 3ccc1e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml
@@ -158,9 +158,12 @@ jobs:
 
       - name: Prepare OpenWrt rootfs
         run: |
+          # Use automated generated image
+          sed -i 's/image: albrechtloh\/openwrt-docker:latest/image: albrechtloh\/openwrt-docker:ci-openwrt-2410-snapshot/g' docker-compose.yml
+
           # Run OpenWrt container for some time to install additional IPKs
           set +e # Enable that the next command can fail
-          timeout --preserve-status 30 docker compose up
+          timeout --preserve-status 60 docker compose up
           set -e # Revert set +e
 
           # Get image from volume

diff --git a/.github/workflows/openwrt-master-build.yml b/.github/workflows/openwrt-master-build.yml
@@ -160,9 +160,12 @@ jobs:
 
       - name: Prepare OpenWrt rootfs
         run: |
+          # Use automated generated image
+          sed -i 's/image: albrechtloh\/openwrt-docker:latest/image: albrechtloh\/openwrt-docker:ci-openwrt-master-snapshot/g' docker-compose.yml
+
           # Run OpenWrt container for some time to install additional IPKs
           set +e # Enable that the next command can fail
-          timeout --preserve-status 30 docker compose up
+          timeout --preserve-status 60 docker compose up
           set -e # Revert set +e
 
           # Get image from volume