chore: make command's run startup-hook.sh [RM-159] (#9275)

determined-ai · May 1, 2024 · 670ac40 · 670ac40
1 parent b78020d
commit 670ac40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/docs/release-notes/command-startup.rst b/docs/release-notes/command-startup.rst
@@ -0,0 +1,6 @@
+:orphan:
+
+**Improvements**
+
+-  Commands: Commands now support automatically executing a ``startup-hook.sh`` script if it is
+   present in the command's context directory.
diff --git a/e2e_tests/tests/command/test_run.py b/e2e_tests/tests/command/test_run.py
@@ -120,6 +120,16 @@ def test_environment_variables_command() -> None:
     _run_cmd(sess, ["--config", config_str, "env | grep -q THISISTRUE=true"], expect_success=True)
 
 
+@pytest.mark.e2e_cpu
+def test_command_startup_hook_works() -> None:
+    sess = api_utils.user_session()
+    _run_cmd(
+        sess,
+        ["--context", conf.fixtures_path("no_op/"), '[ -e "startup-hook-ran" ]'],
+        expect_success=True,
+    )
+
+
 @pytest.mark.parametrize("actual,expected", [("24576", "24"), ("1.5g", "1572864")])
 @pytest.mark.parametrize("use_config_file", [True, False])
 @pytest.mark.slow

diff --git a/master/static/srv/command-entrypoint.sh b/master/static/srv/command-entrypoint.sh
@@ -10,8 +10,10 @@ set -e
 # to register the proxy with the Determined master.
 "$DET_PYTHON_EXECUTABLE" -m determined.exec.prep_container --proxy --download_context_directory
 
+STARTUP_HOOK="startup-hook.sh"
 set -x
 test -f "${TCD_STARTUP_HOOK}" && source "${TCD_STARTUP_HOOK}"
+test -f "${STARTUP_HOOK}" && source "${STARTUP_HOOK}"
 set +x
 
 if [ "$#" -eq 1 ]; then