From 3ccc1e4b86d69a3cc096b41d71c17b0b103d72b4 Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Wed, 27 Nov 2024 13:36:14 +0100 Subject: [PATCH] Fix wrong SBOM generation for snapshots --- .github/workflows/openwrt-2410-snapshot-build.yml | 5 ++++- .github/workflows/openwrt-master-build.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml index a3ac9ab..3fc000c 100644 --- 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 index 0e96ec0..4bee985 100644 --- 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