Skip to content

Commit ee84f41

Browse files
committed
Ensure we scan OCI artifact directories after unpacking nested archives
Signed-off-by: Tobias Wolf <wolf@b1-systems.de>
1 parent e812bf7 commit ee84f41

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

.github/actions/features_parse/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ outputs:
1111
runs:
1212
using: composite
1313
steps:
14-
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
14+
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
1515
- id: result
1616
shell: bash
1717
run: |

.github/actions/flavors_parse/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ outputs:
1313
runs:
1414
using: composite
1515
steps:
16-
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
16+
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
1717
- id: matrix
1818
shell: bash
1919
run: |

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library
33
inputs:
44
version:
55
description: GardenLinux Python library version
6-
default: "0.8.3"
6+
default: "0.8.4"
77
runs:
88
using: composite
99
steps:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "gardenlinux"
3-
version = "0.8.0"
3+
version = "0.8.4"
44
description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames"
55
authors = ["Garden Linux Maintainers <contact@gardenlinux.io>"]
66
license = "Apache-2.0"

src/gardenlinux/oci/container.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,16 +445,15 @@ def push_manifest_and_artifacts_from_directory(
445445
if not isinstance(manifest, Manifest):
446446
raise RuntimeError("Artifacts image manifest given is invalid")
447447

448+
# Scan and extract nested artifacts
449+
for file_path_name in artifacts_dir.glob("*.pxe.tar.gz"):
450+
self._logger.info(f"Found nested artifact {file_path_name}")
451+
extract_targz(file_path_name, artifacts_dir)
452+
448453
files = [
449454
file_name for file_name in artifacts_dir.iterdir() if file_name.is_file()
450455
]
451456

452-
# Scan and extract nested artifacts
453-
for file_path_name in files:
454-
if file_path_name.match("*.pxe.tar.gz"):
455-
self._logger.info(f"Found nested artifact {file_path_name}")
456-
extract_targz(file_path_name, artifacts_dir)
457-
458457
artifacts_with_metadata = Container.get_artifacts_metadata_from_files(
459458
files, manifest.arch
460459
)

0 commit comments

Comments
 (0)