Skip to content

fix: guard tools build-context on directory existence and fix SLURM env var escaping #134

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
coketaste merged 1 commit into from
May 29, 2026
Merged

fix: guard tools build-context on directory existence and fix SLURM env var escaping #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/madengine/deployment/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@ def _prepare_slurm_multi_script(self, model_info: Dict, docker_image_name: str =
])

for key, value in env_vars.items():
script_lines.append(f"export {key}={shlex.quote(str(value))}")
escaped = str(value).replace('\\', '\\\\').replace('"', '\\"').replace('$', '\\$').replace('`', '\\`')
script_lines.append(f'export {key}="{escaped}"')

script_lines.append("")
script_lines.extend([
Expand Down
8 changes: 7 additions & 1 deletion src/madengine/execution/docker_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import os
import shlex
from pathlib import Path
import time
import json
import re
Expand Down Expand Up @@ -177,9 +178,14 @@ def build_image(
# Build the image with logging
build_start_time = time.time()

tools_build_context = ""
tools_dir = Path("scripts/common/tools")
if tools_dir.exists():
tools_build_context = f"--build-context tools={tools_dir} "

build_command = (
f"docker build {use_cache_str} --network=host "
f"--build-context tools=./tools "
f"{tools_build_context}"
f"-t {shlex.quote(docker_image)} --pull -f {shlex.quote(dockerfile)} "
f"{build_args} {shlex.quote(docker_context)}"
)
Expand Down
Loading