git-launcher: remove child env file support

Author: h4x3rotab

git-launcher/README.md

@@ -139,7 +139,6 @@ no shell expansion in the parse step.
 | --- | --- |
 | `REPO_SUBDIR` | Relative directory inside the repo to `cd` into before running the entry point or `RUN_CMD`. Must not be absolute and must not contain `..`. |
 | `ENTRYPOINT_SCRIPT` | Relative path (inside `REPO_SUBDIR` or repo root) to the bash entry script for default mode. Defaults to `entrypoint.sh`. Must not be absolute and must not contain `..`. Trust-bearing in default mode — like `REPO_SUBDIR`, it selects which script runs. |
-| `CHILD_ENV_FILE` | Path to a separate env file. Each `KEY=VALUE` line is `export`ed into the environment seen by `entrypoint.sh` / `INSTALL_CMD` / `RUN_CMD`. The file is parsed line-by-line just like the main config (not sourced). |
 | `RUN_CMD` | **Advanced.** Shell command to exec instead of the default `entrypoint.sh`. Use only when the workload repo cannot host its own entry script. |
 | `INSTALL_CMD` | **Advanced.** Shell command to run before `RUN_CMD`. Only valid alongside `RUN_CMD`. |
 
@@ -155,10 +154,10 @@ In this mode the trust-bearing config in the launcher's config file is
 `REPO_URL` + `COMMIT_SHA` (and `REPO_SUBDIR` if used, since it selects
 which `entrypoint.sh` runs). `WORK_DIR` is local plumbing — it names
 where on the in-TEE filesystem to keep the checkout — and is not
-trust-bearing. `CHILD_ENV_FILE` (and any env it provides) can change the
-script's runtime behavior but does not change the bytes that run; if the
-deployment uses it, audit it the same way you audit any other runtime
-configuration the deployment ships with.
+trust-bearing. Normal process environment variables are inherited by the
+workload. Use Docker Compose `environment:` for non-secret runtime config that
+should be visible at launch, and use dstack encrypted secrets / KMS / mounted
+secret files for secrets.
 
 Because `entrypoint.sh`'s bytes are pinned by `COMMIT_SHA` and stored in
 the workload repo, they are covered by source provenance of the pinned
@@ -234,10 +233,10 @@ the workload container. By default the SDK looks at `/var/run/dstack.sock`.
 Mount it in every compose snippet below; the snippets already include the
 mount.
 
-If your workload talks to a non-default dstack endpoint, set
-`DSTACK_LLM_ROUTER_DSTACK_ENDPOINT` (or whatever endpoint variable your
-workload reads) via `CHILD_ENV_FILE` rather than baking it into the
-launcher config — it is runtime configuration, not a trust-bearing field.
+If your workload talks to a non-default dstack endpoint, set the endpoint
+variable your workload reads through Docker Compose `environment:` rather than
+baking it into the launcher config. It is runtime configuration, not part of
+the Git pin.
 
 ### Local development (host bind-mount)
 
@@ -325,7 +324,7 @@ at specific commits, and asserts:
 * Unknown keys are rejected.
 * `REPO_SUBDIR` containing `..` is rejected.
 * Pre-existing `WORK_DIR` whose `origin` differs from `REPO_URL` is rejected.
-* `CHILD_ENV_FILE` values reach the child process.
+* Normal process environment variables reach the workload.
 * `INSTALL_CMD` runs before `RUN_CMD`.
 * `--help` exits zero.
 * The release workflow runs launcher tests before building the image and

git-launcher/VERIFY.md

@@ -235,9 +235,10 @@ Parse the `configs:` content from step 2 and read `REPO_URL` and
 `COMMIT_SHA` (plus `REPO_SUBDIR` and `ENTRYPOINT_SCRIPT` if present —
 each selects which script in the pinned repo is used). `WORK_DIR` is
 local plumbing only and is not part of the trust-bearing config.
-`CHILD_ENV_FILE` (and any env it supplies) does not change the bytes that
-run; if used, audit it as runtime deployment configuration, not as
-source.
+Docker Compose `environment:` does not change the bytes that run, but it can
+change workload behavior. Audit non-secret environment variables as runtime
+deployment configuration, and keep secrets in encrypted secrets / KMS / mounted
+secret files rather than inline compose.
 
 In default mode there are no `INSTALL_CMD` / `RUN_CMD` strings to audit —
 the entry point is the fixed-path `entrypoint.sh` in the workload repo,

git-launcher/bin/git-launcher

@@ -48,9 +48,6 @@ Optional keys:
   ENTRYPOINT_SCRIPT Relative path inside REPO_SUBDIR (or the repo root) to the
                     bash entry script for default mode. Defaults to
                     'entrypoint.sh'. Must not be absolute or contain '..'.
-  CHILD_ENV_FILE    Path to a separate KEY=VALUE env file. Each key listed
-                    there is exported into the environment of the entry point
-                    / RUN_CMD.
   RUN_CMD           Advanced: shell command to exec instead of the workload's
                     default entry point. Use only when the workload repo
                     cannot host its own entry script.
@@ -108,7 +105,6 @@ parse_config() {
   CFG_WORK_DIR=
   CFG_REPO_SUBDIR=
   CFG_ENTRYPOINT_SCRIPT=
-  CFG_CHILD_ENV_FILE=
   CFG_INSTALL_CMD=
   CFG_RUN_CMD=
   CFG_INSTALL_CMD_SET=0
@@ -137,7 +133,6 @@ parse_config() {
       WORK_DIR)          CFG_WORK_DIR=$val ;;
       REPO_SUBDIR)       CFG_REPO_SUBDIR=$val ;;
       ENTRYPOINT_SCRIPT) CFG_ENTRYPOINT_SCRIPT=$val ;;
-      CHILD_ENV_FILE)    CFG_CHILD_ENV_FILE=$val ;;
       INSTALL_CMD)       CFG_INSTALL_CMD=$val; CFG_INSTALL_CMD_SET=1 ;;
       RUN_CMD)           CFG_RUN_CMD=$val; CFG_RUN_CMD_SET=1 ;;
       *) die "unknown config key '$key' at $config_file:$lineno" ;;
@@ -221,30 +216,6 @@ ensure_repo_at_commit() {
   log "HEAD verified: $head"
 }
 
-apply_child_env() {
-  local env_file=$1
-  [[ -f $env_file ]] || die "CHILD_ENV_FILE not found: $env_file"
-  local line key val lineno=0 trimmed
-  while IFS= read -r line || [[ -n $line ]]; do
-    lineno=$((lineno + 1))
-    trimmed=${line#"${line%%[![:space:]]*}"}
-    [[ -z $trimmed ]] && continue
-    [[ ${trimmed:0:1} == '#' ]] && continue
-    if [[ ! $trimmed =~ ^([A-Za-z_][A-Za-z0-9_]*)=(.*)$ ]]; then
-      die "child env parse error at $env_file:$lineno: $trimmed"
-    fi
-    key=${BASH_REMATCH[1]}
-    val=${BASH_REMATCH[2]}
-    if [[ ${#val} -ge 2 ]]; then
-      local first=${val:0:1} last=${val: -1}
-      if [[ ($first == '"' && $last == '"') || ($first == "'" && $last == "'") ]]; then
-        val=${val:1:${#val}-2}
-      fi
-    fi
-    export "$key=$val"
-  done < "$env_file"
-}
-
 main() {
   parse_config "$CONFIG_FILE"
   validate_config
@@ -256,9 +227,6 @@ main() {
   if [[ -n $CFG_REPO_SUBDIR ]]; then
     log "subdir:   $CFG_REPO_SUBDIR"
   fi
-  if [[ -n $CFG_CHILD_ENV_FILE ]]; then
-    log "envfile:  $CFG_CHILD_ENV_FILE"
-  fi
   if [[ $CFG_RUN_CMD_SET -eq 1 ]]; then
     log "mode:     advanced (RUN_CMD)"
     [[ -n $CFG_INSTALL_CMD ]] && log "install:  $CFG_INSTALL_CMD"
@@ -277,10 +245,6 @@ main() {
   fi
   cd "$target"
 
-  if [[ -n $CFG_CHILD_ENV_FILE ]]; then
-    apply_child_env "$CFG_CHILD_ENV_FILE"
-  fi
-
   if [[ $CFG_RUN_CMD_SET -eq 1 ]]; then
     if [[ -n $CFG_INSTALL_CMD ]]; then
       log "running install in $target"

git-launcher/examples/web-app.conf

@@ -37,11 +37,9 @@ WORK_DIR=/var/lib/git-launcher/example-web-app
 # mode (selects which script runs). Absolute paths and '..' are rejected.
 # ENTRYPOINT_SCRIPT=scripts/launch.sh
 
-# Optional: a second env file whose KEY=VALUE lines are exported into the
-# environment of entrypoint.sh. Use this for runtime configuration (listen
-# address, secrets, etc.) — keeping it separate from the pin config means
-# config-only edits do not perturb the trust-bearing fields above.
-# CHILD_ENV_FILE=/etc/git-launcher/web-app.env
+# Runtime configuration is not part of this launcher config. Pass non-secret
+# workload env through Docker Compose `environment:` and pass secrets through
+# dstack encrypted secrets, KMS, or mounted secret files.
 
 # Advanced mode (use only if the workload repo cannot host its own
 # entrypoint.sh — e.g. you are pinning a third-party repo unchanged):

git-launcher/tests/run-tests.sh

@@ -5,8 +5,8 @@
 #
 # Builds a throwaway local git repo so the tests do not hit the network,
 # pins the launcher to specific commits in that repo, and asserts that the
-# launcher checks out the right commit, refuses bad inputs, and propagates
-# the child env file.
+# launcher checks out the right commit, refuses bad inputs, and preserves
+# the process environment for the workload.
 #
 # Requires: bash, git, mktemp.
 
@@ -339,26 +339,20 @@ EOF
   return 0
 }
 
-test_child_env_file() {
+test_environment_passes_through() {
   local work=$TMPROOT/work-env
   local marker=$TMPROOT/marker-env.txt
-  local envfile=$TMPROOT/workload.env
   local conf=$TMPROOT/conf-env.env
-  cat > "$envfile" <<EOF
-# a comment
-CHILD_ENV_EXTRA=passed-through
-EOF
   cat > "$conf" <<EOF
 REPO_URL=$FIXTURE
 COMMIT_SHA=$PIN_SHA
 WORK_DIR=$work
 REPO_SUBDIR=sub
-CHILD_ENV_FILE=$envfile
 INSTALL_CMD=
 RUN_CMD="MARKER_FILE='$marker' ./run.sh"
 EOF
-  "$LAUNCHER" "$conf" || return 1
-  grep -q "child_env_extra=passed-through" "$marker" || { echo "CHILD_ENV_FILE not applied" >&2; cat "$marker" >&2; return 1; }
+  CHILD_ENV_EXTRA=passed-through "$LAUNCHER" "$conf" || return 1
+  grep -q "child_env_extra=passed-through" "$marker" || { echo "process environment not preserved" >&2; cat "$marker" >&2; return 1; }
   return 0
 }
 
@@ -533,7 +527,7 @@ run_case "unknown_key_rejected"                  test_unknown_key_rejected
 run_case "repo_subdir_escape_rejected"           test_repo_subdir_escape_rejected
 run_case "origin_mismatch_rejected"              test_origin_mismatch_rejected
 run_case "non_git_non_empty_work_dir_rejected"   test_non_git_non_empty_work_dir_rejected
-run_case "child_env_file_passes_through"         test_child_env_file
+run_case "environment_passes_through"            test_environment_passes_through
 run_case "install_runs_before_run"               test_install_runs_before_run
 run_case "default_mode_happy"                    test_default_mode_happy
 run_case "default_mode_missing_script_fails"     test_default_mode_missing_script_fails