Skip to content

Commit

Permalink
Merge pull request #259 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
envsetup.sh: Do not allocate pseudo TTY
  • Loading branch information
cbrake authored Jan 29, 2020
2 parents a4bb524 + 9afe273 commit 2a2e81b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=~/
Expand All @@ -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 \
Expand Down

0 comments on commit 2a2e81b

Please sign in to comment.