Merge pull request #43 from jcfr/support-ctrl-c

base/dockcross: Run docker using -t to support CTRL-C
This commit is contained in:
Matt McCormick 2016-09-23 11:36:56 -04:00 committed by GitHub
commit 01a3348f15
2 changed files with 3 additions and 2 deletions

View File

@ -211,7 +211,7 @@ Examples
4. ``dockcross bash -c '$CC test/C/hello.c -o hello'``: Build the *hello.c* file 4. ``dockcross bash -c '$CC test/C/hello.c -o hello'``: Build the *hello.c* file
with the compiler identified with the ``CC`` environmental variable in the with the compiler identified with the ``CC`` environmental variable in the
build environment. build environment.
5. ``dockcross --args -it bash``: Run an interactive shell in the build environment. 5. ``dockcross bash``: Run an interactive shell in the build environment.
Note that commands are executed verbatim. If any shell processing for Note that commands are executed verbatim. If any shell processing for
environment variable expansion or redirection is required, please use environment variable expansion or redirection is required, please use

View File

@ -179,7 +179,8 @@ fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Now, finally, run the command in a container # Now, finally, run the command in a container
# #
docker run --rm \ tty -s && TTY_ARGS=-ti || TTY_ARGS=
docker run $TTY_ARGS --rm \
-v $PWD:/work \ -v $PWD:/work \
$USER_IDS \ $USER_IDS \
$FINAL_ARGS \ $FINAL_ARGS \