Skip to content

Commit 26128f7

Browse files
authored
Merge pull request #12 from scality/feature/add-source-iso-for-image-sbom
✨ add image iso source in sbom filename
2 parents d784707 + 80e752f commit 26128f7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@
131131
subdir_path = os.path.join(subroot, subdir)
132132
print(f"Scanning image dir: {subdir_path}")
133133
detect_image_origin(subdir_path)
134+
# get source iso basename
135+
source_iso = os.path.basename(extracted_dir)
136+
IMAGE_FILE_PREFIX=f"{OUTPUT_FILE_PREFIX}_{source_iso}"
134137
EXCLUDED = check_mediatype(
135138
subdir_path, excluded_mediatypes
136139
)
@@ -145,7 +148,7 @@
145148
name=image_name,
146149
version=image_version,
147150
output_dir=OUTPUT_DIR,
148-
output_file_prefix=OUTPUT_FILE_PREFIX,
151+
output_file_prefix=IMAGE_FILE_PREFIX,
149152
sbom_format=SBOM_FORMAT,
150153
)
151154
scan_command.execute()
@@ -157,7 +160,7 @@
157160
name=image_name,
158161
version=image_version,
159162
output_dir=OUTPUT_DIR,
160-
output_file_prefix=OUTPUT_FILE_PREFIX,
163+
output_file_prefix=IMAGE_FILE_PREFIX,
161164
sbom_format=SBOM_FORMAT,
162165
)
163166
scan_command.execute()

0 commit comments

Comments
 (0)