diff --git a/python/LbNightlyTools/BuildMethods.py b/python/LbNightlyTools/BuildMethods.py index 22222aa64e51aa46007c892be39604b3c263c347..56a96fbdcd85d9521d55ee0c43c3d23605d1bc79 100644 --- a/python/LbNightlyTools/BuildMethods.py +++ b/python/LbNightlyTools/BuildMethods.py @@ -64,9 +64,9 @@ def _apptainer_wrap_cmd(platform, cmd, host_root, cont_root, env, cwd): image = None if re.match(r"x86_64.*-centos7-.*", platform): - image = "/cvmfs/cernvm-prod.cern.ch/cvm4" + image = "/cvmfs/lhcb.cern.ch/containers/os-base/centos7-devel/prod/amd64" elif re.match(r"x86_64.*-slc[56]-.*", platform): - image = "/cvmfs/cernvm-prod.cern.ch/cvm3" + image = "/cvmfs/lhcb.cern.ch/containers/os-base/slc6-devel/prod/amd64" elif re.match(r"x86_64.*-el9-.*", platform): image = "/cvmfs/lhcb.cern.ch/containers/os-base/alma9-devel/prod/amd64" elif re.match(r"arm.*-centos7-.*", platform): @@ -80,6 +80,7 @@ def _apptainer_wrap_cmd(platform, cmd, host_root, cont_root, env, cwd): apptainer_cmd = [ apptainer, "exec", + "--contain", "--bind", "/cvmfs", "--bind", @@ -126,6 +127,8 @@ def log_call(cmd, *args, **kwargs): key: value.replace(host_root, cont_root) for key, value in (kwargs.get("env") or os.environ).items() } + # patch the command line arguments + cmd = [value.replace(host_root, cont_root) for value in cmd] cmd = _apptainer_wrap_cmd( os.environ["BINARY_TAG"],