From 0d08d2698b6ee9becd0ff6d6e7d0fc4be6dde11d Mon Sep 17 00:00:00 2001
From: Eric Lunderberg <elunderberg@octoml.ai>
Date: Thu, 26 Aug 2021 15:41:05 -0500
Subject: [PATCH] [Docker] Re-enabled automatic --tty flag when running bash.

PR8382 split apart the --interactive and --tty flags, but only
--interactive was set if the user opens a bash session.  This commit
restores the previous behavior of running `docker/bash.sh IMAGE_NAME`
of opening a bash session with both --interactive and --tty.
---
 docker/bash.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/bash.sh b/docker/bash.sh
index 2a05abf4f2bc..372cfded8f89 100755
--- a/docker/bash.sh
+++ b/docker/bash.sh
@@ -38,7 +38,7 @@ set -euo pipefail
 
 function show_usage() {
     cat <<EOF
-Usage: docker/bash.sh [-i|--interactive] [--net=host]
+Usage: docker/bash.sh [-i|--interactive] [--net=host] [-t|--tty]
          [--mount MOUNT_DIR] [--repo-mount-point REPO_MOUNT_POINT]
          [--dry-run]
          <DOCKER_IMAGE_NAME> [--] [COMMAND]
@@ -95,7 +95,7 @@ DOCKER_IMAGE_NAME
 COMMAND
 
     The command to be run inside the docker container.  If this is set
-    to "bash", both the --interactive and --net=host flags are set.
+    to "bash", the --interactive, --tty and --net=host flags are set.
     If no command is specified, defaults to "bash".  If the command
     contains dash-prefixed arguments, the command should be preceded
     by -- to indicate arguments that are not intended for bash.sh.
@@ -235,6 +235,7 @@ fi
 
 if [[ ${COMMAND[@]+"${COMMAND[@]}"} = bash ]]; then
     INTERACTIVE=true
+    TTY=true
     USE_NET_HOST=true
 fi