make docker allocate a tty

Also avoid one unnecessary shell.
wesnoth · Mar 5, 2019 · 21e43f1 · 21e43f1
1 parent d241115
commit 21e43f1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh
@@ -41,7 +41,6 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
 else
     docker run --volume "$HOME"/build-cache:/home/wesnoth-travis/build \
                --volume "$HOME"/.ccache:/root/.ccache \
-               wesnoth-repo:"$LTS"-"$BRANCH" \
-               bash -c './utils/travis/docker_run.sh "$@"' \
-               bash "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE"
+               --tty wesnoth-repo:"$LTS"-"$BRANCH" \
+               ./utils/travis/docker_run.sh "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE"
 fi