Compare commits
3 Commits
feature/se
...
develop
Author | SHA1 | Date | |
---|---|---|---|
9e9fdee0d6 | |||
8db349571a | |||
68ca0365ae |
14
package
14
package
@ -41,7 +41,7 @@ def build_image(build_workspace, base_image, profile_name, profile, debug=False,
|
||||
# Run hooks
|
||||
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
|
||||
|
||||
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
|
||||
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_').replace('/', '_'), os.getpid())
|
||||
|
||||
build_args = [ "build", "-t", image_tag ]
|
||||
|
||||
@ -108,16 +108,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:ro".format(project_dir),
|
||||
"-v", "{:s}:/dist".format(output_dir),
|
||||
]
|
||||
|
||||
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:ro".format(tamarin.get_hooks_dir()),
|
||||
"-v", "{:s}:/tamarin/lib:ro".format(tamarin.get_lib_dir()),
|
||||
"-v", "{:s}:/tamarin/profiles:ro".format(tamarin.get_profiles_dir()),
|
||||
"-v", "{:s}:/tamarin/utils:ro".format(tamarin.get_utils_dir())
|
||||
]
|
||||
|
||||
# Use environment proxy if defined
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Configuration générale du profil
|
||||
[profile]
|
||||
# Image Docker par défaut
|
||||
default_image=debian:stretch
|
||||
default_image=reg.cadoles.com/proxy_cache/library/debian:bookworm
|
||||
|
||||
# Configuration de l'étape de pré-construction du conteneur
|
||||
[containerbuild]
|
||||
|
Loading…
Reference in New Issue
Block a user