diff --git a/envsetup.sh b/envsetup.sh
index 570fc8e1d..19d98e1f0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -467,10 +467,12 @@ dkr() {
   check_docker || return 1
 
   CMD="$1"
+  PSEUDOTTY=""
 
   if [ -z "$CMD" ]; then
     echo "setting dkr action to shell"
     CMD="/bin/bash"
+    PSEUDOTTY="--tty"
   fi
 
   SSH_AUTH_DIR=~/
@@ -492,7 +494,7 @@ dkr() {
     SSH_AUTH_DIR=$(readlink -f $SSH_AUTH_SOCK)
   fi
 
-  docker run --rm -it \
+  docker run --rm -i ${PSEUDOTTY} --log-driver=none -a stdin -a stdout -a stderr \
     -v $(pwd):$(pwd) \
     -v ~/.ssh:/home/build/.ssh \
     -v ~/.gitconfig:/home/build/.gitconfig \