Make it possible to run dplsh non-interactive

reload · May 25, 2021 · 881daf3 · 881daf3
1 parent 2aaf802
commit 881daf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tools/dplsh/Taskfile.yml b/tools/dplsh/Taskfile.yml
@@ -21,6 +21,7 @@ tasks:
   test:
     env:
       DPLSH_IMAGE: "{{.image}}"
+      DPLSH_NON_INTERACTIVE: "true"
     cmds:
       - ./dplsh.sh terraform -version
       - ./dplsh.sh helm version
diff --git a/tools/dplsh/dplsh.sh b/tools/dplsh/dplsh.sh
@@ -204,10 +204,15 @@ for key in "${!docker_creds[@]}"; do
   ADDITIONAL_ARGS+=(-e "${key}=${docker_creds[$key]}")
 done
 
+# We run in interactive mode unless if we're in DPLSH_NON_INTERACTIVE.
+if [[ -z "${DPLSH_NON_INTERACTIVE:-}" ]]; then
+  ADDITIONAL_ARGS+=(-i)
+fi
+
 docker run --hostname=dplsh \
     --rm \
     "${ADDITIONAL_ARGS[@]}" \
-    -ti \
+    -t \
     -v "${HOME}/.azure:/home/dplsh/.azure-host" \
     -v "${SHELL_ROOT}:/home/dplsh/host_mount" \
     -w "/home/dplsh/host_mount/${CHDIR}" \