Fix wrong SBOM generation for snapshots

This commit is contained in:
Albrecht Lohofener
2024-11-27 13:36:14 +01:00
parent d85d3cfae4
commit 3ccc1e4b86
2 changed files with 8 additions and 2 deletions
@@ -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
+4 -1
View File
@@ -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