Cadoles/Tamarin
22
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Utilisation de pathlib

Browse Source
This commit is contained in:
Benjamin Bohard
2023-01-31 11:25:20 +01:00
parent f10834b002
commit 201e6be255
2 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
package
View File

@ -1,8 +1,8 @@
#!/usr/bin/env python3
import argparse, sys, shutil, os, subprocess
import argparse, sys, shutil, os, subprocess, pathlib
sys.path.append(os.path.dirname(__file__) + '/lib')
sys.path.append(pathlib.Path(__file__).parent.joinpath('lib').as_posix())
import tamarin
@ -28,18 +28,18 @@ def create_args_parser():
return parser
def build_image(build_workspace, base_image, profile_name, profile, debug=False, rebuild=False):
shutil.copytree(tamarin.get_base_dir(), os.path.join(build_workspace, '.tamarin'))
shutil.copytree(tamarin.get_base_dir(), build_workspace.joinpath('.tamarin'))
with open("{:s}/Dockerfile".format(build_workspace), 'w') as dockerfile:
with open(build_workspace.joinpath("Dockerfile"), 'w') as dockerfile:
dockerfile.write("FROM {:s}\n".format(base_image))
dockerfile.write("COPY .tamarin /tamarin\n")
# Configure "containerbuild" hooks environment
hooks_env = os.environ.copy()
hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir()
hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir().as_posix()
# Run hooks
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace.as_posix(), env=hooks_env, debug=debug)
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
@ -72,8 +72,9 @@ if __name__ == "__main__":
cleanup(debug=args.debug)
# Verify project directory
project_dir = os.path.abspath(args.project_directory)
output_dir = os.path.abspath(args.output)
project_dir = pathlib.Path(args.project_directory).absolute()
output_dir = pathlib.Path(args.output).absolute()
output_dir.mkdir(parents=True, exist_ok=True)
# Load build profile
profile = tamarin.load_profile(args.profile, debug=args.debug)
@ -83,7 +84,7 @@ if __name__ == "__main__":
pid = os.getpid()
build_workspace = tamarin.get_workspace_subdir('tmp/build_{:d}'.format(pid))
shutil.copytree(tamarin.get_utils_dir(), os.path.join(build_workspace, 'utils'))
shutil.copytree(tamarin.get_utils_dir(), build_workspace.joinpath('utils'))
base_image = args.base if args.base != '' else profile['profile']['default_image']
@ -108,16 +109,16 @@ if __name__ == "__main__":
# volumes definition
docker_args += [
"-v", "{:s}:/src:z,ro".format(project_dir),
"-v", "{:s}:/dist:z".format(output_dir),
"-v", "{:s}:/src:z,ro".format(project_dir.as_posix()),
"-v", "{:s}:/dist:z".format(output_dir.as_posix()),
]
if not args.no_lib_mounts:
docker_args += [
"-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir()),
"-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir()),
"-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir()),
"-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir())
"-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir().as_posix()),
"-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir().as_posix()),
"-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir().as_posix()),
"-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir().as_posix())
]
# Use environment proxy if defined