Base gestion mode debug
This commit is contained in:
58
package
58
package
@ -23,23 +23,23 @@ def create_args_parser():
|
||||
|
||||
return parser
|
||||
|
||||
def download_and_extract_rkt(dest_dir, verbose=True):
|
||||
def download_and_extract_rkt(dest_dir, debug=False):
|
||||
'''Download and extract rkt to the given destination directory'''
|
||||
rkt_archive_path = tamarin.download_rkt()
|
||||
system.extract_tar(rkt_archive_path, workspace_tmp)
|
||||
rkt_archive_path = tamarin.download_rkt(debug=debug)
|
||||
system.extract_tar(rkt_archive_path, workspace_tmp, debug=debug)
|
||||
rkt_archive_dir = tamarin.get_rkt_achive_dest_dir()
|
||||
shutil.rmtree(local_rkt_dir, ignore_errors=True)
|
||||
os.rename(rkt_archive_dir, dest_dir)
|
||||
|
||||
def download_and_extract_acbuild(dest_dir, verbose=True):
|
||||
def download_and_extract_acbuild(dest_dir, debug=False):
|
||||
'''Download and extract acbuild to the given destination directory'''
|
||||
acbuild_archive_path = tamarin.download_acbuild()
|
||||
system.extract_tar(acbuild_archive_path, workspace_tmp)
|
||||
acbuild_archive_path = tamarin.download_acbuild(debug=debug)
|
||||
system.extract_tar(acbuild_archive_path, workspace_tmp, debug=debug)
|
||||
acbuild_archive_dir = tamarin.get_acbuild_achive_dest_dir()
|
||||
shutil.rmtree(local_acbuild_dir, ignore_errors=True)
|
||||
os.rename(acbuild_archive_dir, dest_dir)
|
||||
|
||||
def get_cached_image_path(profile):
|
||||
def get_cached_image_path(profile, debug=False):
|
||||
'''Compute and return the path for an hypothetic cached image for the given profile'''
|
||||
containerbuild_hooks = profile['containerbuild']['hooks']
|
||||
hasher = hashlib.sha1()
|
||||
@ -49,23 +49,23 @@ def get_cached_image_path(profile):
|
||||
cache_dir = tamarin.get_workspace_subdir('cache')
|
||||
return os.path.join(os.sep, cache_dir, '{:s}.aci'.format(image_hash[:12]));
|
||||
|
||||
def build_image(build_workspace, aci_file, base_image, profile):
|
||||
def build_image(build_workspace, aci_file, base_image, profile, debug=False):
|
||||
|
||||
acbuild_flags = ["--work-path", build_workspace]
|
||||
|
||||
# Find and export base image from rkt' store
|
||||
name_pattern = base_image.split('/')[-1] + '$'
|
||||
image = rkt.find_image_by_name(name_pattern, rkt_flags=rkt_flags)
|
||||
rkt.export_image(image['id'], aci_file, rkt_flags=rkt_flags);
|
||||
rkt.export_image(image['id'], aci_file, rkt_flags=rkt_flags, debug=debug);
|
||||
|
||||
# Build image
|
||||
tamarin.run_acbuild(acbuild_flags+["begin", aci_file])
|
||||
tamarin.run_acbuild(acbuild_flags+["set-name", "image_{:d}".format(pid)])
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "src", "/src", "--read-only"])
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "dist", "/dist"])
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-hooks", "/tamarin/hooks", "--read-only"])
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-lib", "/tamarin/lib", "--read-only"])
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-profiles", "/tamarin/profiles", "--read-only"])
|
||||
tamarin.run_acbuild(acbuild_flags+["begin", aci_file], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["set-name", "image_{:d}".format(pid)], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "src", "/src", "--read-only"], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "dist", "/dist"], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-hooks", "/tamarin/hooks", "--read-only"], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-lib", "/tamarin/lib", "--read-only"], debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["mount", "add", "tamarin-profiles", "/tamarin/profiles", "--read-only"], debug=debug)
|
||||
|
||||
# Configure "containerbuild" hooks environment
|
||||
hooks_env = os.environ.copy()
|
||||
@ -74,26 +74,26 @@ def build_image(build_workspace, aci_file, base_image, profile):
|
||||
hooks_env["TAMARIN_ACBUILD_ENGINE"] = "chroot" if not system.which('systemctl') else "systemd-nspawn"
|
||||
|
||||
# Run hooks
|
||||
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env)
|
||||
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
|
||||
|
||||
tamarin.run_acbuild(acbuild_flags+["write", "--overwrite", aci_file])
|
||||
tamarin.run_acbuild(acbuild_flags+["end"])
|
||||
tamarin.run_acbuild(acbuild_flags+["write", "--overwrite", aci_file], as_root=True, debug=debug)
|
||||
tamarin.run_acbuild(acbuild_flags+["end"], as_root=True, debug=debug)
|
||||
|
||||
return aci_file
|
||||
|
||||
def cleanup(build_workspace, rkt_flags):
|
||||
def cleanup(build_workspace, rkt_flags, debug=False):
|
||||
|
||||
# Nettoyage des conteneurs
|
||||
rkt.run([
|
||||
"gc",
|
||||
"--grace-period=0"
|
||||
] + rkt_flags, as_root=True)
|
||||
] + rkt_flags, as_root=True, debug=debug)
|
||||
|
||||
# Nettoyage des images obsolètes du store
|
||||
rkt.run([
|
||||
"image",
|
||||
"gc"
|
||||
] + rkt_flags, as_root=True)
|
||||
] + rkt_flags, as_root=True, debug=debug)
|
||||
|
||||
# Suppression de l'espace de travail de build
|
||||
shutil.rmtree(build_workspace, ignore_errors=True)
|
||||
@ -113,7 +113,7 @@ if __name__ == "__main__":
|
||||
output_dir = os.path.abspath(args.output)
|
||||
|
||||
# Load build profile
|
||||
profile = tamarin.load_profile(args.profile)
|
||||
profile = tamarin.load_profile(args.profile, debug=args.debug)
|
||||
|
||||
workspace = tamarin.get_workspace_dir()
|
||||
workspace_tmp = tamarin.get_workspace_subdir('tmp')
|
||||
@ -140,16 +140,16 @@ if __name__ == "__main__":
|
||||
"fetch",
|
||||
"--insecure-options=image",
|
||||
base_image
|
||||
] + rkt_flags)
|
||||
] + rkt_flags, debug=args.debug)
|
||||
|
||||
aci_file = os.path.join(os.sep, build_workspace, 'image.aci')
|
||||
cached_image_file = get_cached_image_path(profile)
|
||||
cached_image_file = get_cached_image_path(profile, debug=args.debug)
|
||||
|
||||
if not args.rebuild and os.path.exists(cached_image_file):
|
||||
# Copy cached image
|
||||
shutil.copyfile(cached_image_file, aci_file)
|
||||
else:
|
||||
build_image(build_workspace, aci_file, base_image, profile)
|
||||
build_image(build_workspace, aci_file, base_image, profile, debug=args.debug)
|
||||
# Cache image
|
||||
shutil.copyfile(aci_file, cached_image_file)
|
||||
|
||||
@ -172,11 +172,13 @@ if __name__ == "__main__":
|
||||
|
||||
if args.debug:
|
||||
rkt_args += ["--interactive", "--exec", "/bin/bash"]
|
||||
helper_cmd = " ".join(["/usr/bin/python3", "/tamarin/lib/build.py", args.profile, args.architecture])
|
||||
print("Executer '{:s}' pour lancer la construction du paquet.".format(helper_cmd))
|
||||
else:
|
||||
rkt_args += ["--exec", "/usr/bin/python3", "--", "/tamarin/lib/build.py", args.profile, args.architecture]
|
||||
|
||||
# Start container
|
||||
rkt.run(rkt_flags+rkt_args, as_root=True)
|
||||
rkt.run(rkt_flags+rkt_args, as_root=True, debug=args.debug)
|
||||
|
||||
# Cleanup
|
||||
cleanup(build_workspace, rkt_flags)
|
||||
cleanup(build_workspace, rkt_flags, debug=args.debug)
|
||||
|
||||
Reference in New Issue
Block a user