Skip to content

Expose job working dir via environment variable #3049

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
un-def merged 2 commits into from
Sep 3, 2025
Merged

Expose job working dir via environment variable #3049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
084dec8
Expose job working dir via environment variable
un-def Sep 2, 2025
45102d9
Fix tests
un-def Sep 2, 2025
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
4 changes: 4 additions & 0 deletions runner/internal/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ func (ex *RunExecutor) execJob(ctx context.Context, jobLogFile io.Writer) error
"DSTACK_RUN_NAME": ex.run.RunSpec.RunName,
"DSTACK_REPO_ID": ex.run.RunSpec.RepoId,
"DSTACK_REPO_DIR": ex.repoDir,
"DSTACK_WORKING_DIR": ex.jobWorkingDir,
"DSTACK_NODES_IPS": strings.Join(ex.clusterInfo.JobIPs, "\n"),
"DSTACK_MASTER_NODE_IP": ex.clusterInfo.MasterJobIP,
"DSTACK_NODE_RANK": strconv.Itoa(node_rank),
Expand Down Expand Up @@ -864,6 +865,9 @@ func writeDstackProfile(env map[string]string, pth string) error {
return err
}
}
if _, err = file.WriteString("cd \"$DSTACK_WORKING_DIR\"\n"); err != nil {
return err
}
if err = os.Chmod(pth, 0o644); err != nil {
return err
}
Expand Down
10 changes: 9 additions & 1 deletion src/dstack/_internal/server/services/jobs/configurators/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,15 @@ def _dstack_image_commands(self) -> List[str]:
):
return []
return [
f"uv venv -q --prompt $DSTACK_RUN_NAME --seed -p {self._python()} {DSTACK_DIR}/venv",
# `uv` may emit:
# > warning: `VIRTUAL_ENV=/dstack/venv` does not match the project environment path
# > `.venv` and will be ignored; use `--active` to target the active environment
# > instead
# Safe to ignore, reusing dstack's venv for `uv` is discouraged (it should only be
# used for legacy `pip`-based configurations). `--no-active` suppresses the warning.
# Alternatively, the user can call `deactivate` once before using `uv`.
# If the user really wants to reuse dstack's venv, they must spefify `--active`.
f"uv venv -q --prompt dstack -p {self._python()} --seed {DSTACK_DIR}/venv",
f"echo '. {DSTACK_DIR}/venv/bin/activate' >> {DSTACK_PROFILE_PATH}",
f". {DSTACK_DIR}/venv/bin/activate",
]
Expand Down
4 changes: 2 additions & 2 deletions src/tests/_internal/server/routers/test_runs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def get_dev_env_run_plan_dict(
"-i",
"-c",
(
"uv venv -q --prompt $DSTACK_RUN_NAME --seed -p 3.13 /dstack/venv"
"uv venv -q --prompt dstack -p 3.13 --seed /dstack/venv"
" && echo '. /dstack/venv/bin/activate' >> /dstack/profile"
" && . /dstack/venv/bin/activate"
" && (echo 'pip install ipykernel...'"
Expand Down Expand Up @@ -314,7 +314,7 @@ def get_dev_env_run_dict(
"-i",
"-c",
(
"uv venv -q --prompt $DSTACK_RUN_NAME --seed -p 3.13 /dstack/venv"
"uv venv -q --prompt dstack -p 3.13 --seed /dstack/venv"
" && echo '. /dstack/venv/bin/activate' >> /dstack/profile"
" && . /dstack/venv/bin/activate"
" && (echo 'pip install ipykernel...'"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/_internal/server/services/jobs/configurators/test_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ async def test_with_commands_no_image(self, shell: Optional[str], expected_shell
expected_shell,
"-i",
"-c",
"uv venv -q --prompt $DSTACK_RUN_NAME --seed -p 3.12 /dstack/venv"
"uv venv -q --prompt dstack -p 3.12 --seed /dstack/venv"
" && echo '. /dstack/venv/bin/activate' >> /dstack/profile"
" && . /dstack/venv/bin/activate"
" && sleep inf",
Expand Down
Loading