mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 16:24:27 +01:00
base/dockcross: Run docker with "-ti" only if a tty or pts is attached
This commit reverts f07ca00
(base: Do not add -i -t flags to run command
by default) and ensure tty is available before specifying the flags.
This commit is contained in:
parent
aa2c24cb3b
commit
af75453ed0
@ -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
|
||||||
|
@ -179,7 +179,8 @@ fi
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# Now, finally, run the command in a container
|
# Now, finally, run the command in a container
|
||||||
#
|
#
|
||||||
docker run -t --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 \
|
||||||
|
Loading…
Reference in New Issue
Block a user