Skip to content

chore: Use a tar lib instead of shelling out in fs build #11107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bownairo merged 2 commits into from
Aug 13, 2026
Merged

chore: Use a tar lib instead of shelling out in fs build #11107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
000330e
Use a tar lib instead of shelling out in fs build
Bownairo Aug 6, 2026
d478d42
Trigger CI
Bownairo Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions toolchains/sysimage/build_container_filesystem_tar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import argparse
import os
import shutil
import subprocess
import tarfile
import tempfile
import uuid
from dataclasses import dataclass
Expand Down Expand Up @@ -105,22 +107,27 @@ def export_container_filesystem(image_tag: str, destination_tar_filename: str):
Export the filesystem from an image.
Creates container - but does not start it, avoiding timestamp and other determinism issues.
"""
# tempfile cleanup is handled by proc_wrapper.sh
tempdir = tempfile.mkdtemp()
tar_file = tempdir + "/temp.tar"
fakeroot_statefile = tempdir + "/fakeroot.state"
tar_dir = tempdir + "/tar"

container_name = image_tag + "_container"
storage_args = get_storage_dir_args()

invoke.run(f"podman {storage_args} create --name {container_name} {image_tag}")
invoke.run(f"podman {storage_args} export -o {tar_file} {container_name}")
invoke.run(f"mkdir -p {tar_dir}")
invoke.run(f"fakeroot -s {fakeroot_statefile} tar xpf {tar_file} --same-owner --numeric-owner -C {tar_dir}")
invoke.run(
f"fakeroot -i {fakeroot_statefile} tar cf {destination_tar_filename} --mtime='UTC 1970-01-01 00:00:00' --numeric-owner --sort=name --exclude='run/*' -C {tar_dir} $(ls -A {tar_dir})"
)

with subprocess.Popen(f"podman {storage_args} export {container_name}", stdout=subprocess.PIPE, shell=True) as proc:
with tarfile.open(fileobj=proc.stdout, mode="r|") as source, tarfile.open(
destination_tar_filename, "w|", format=tarfile.GNU_FORMAT
) as destination:
for member in source:
if member.name.startswith("run/"):
continue

if member.islnk() and member.linkname.startswith("run/"):
raise RuntimeError(f"{member.name} is a hard link to `/run`, which is stripped out of the image")

data = source.extractfile(member) if member.isfile() else None
destination.addfile(member.replace(mtime=0, uname="", gname="", deep=False), data)

if proc.returncode != 0:
raise RuntimeError(f"podman export failed (exit {proc.returncode})")


def resolve_file_args(context_dir: str, file_build_args: List[str]) -> List[str]:
Expand Down
Loading