diff options
| author | Eric Huss <eric@huss.org> | 2020-07-01 21:03:14 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2020-07-01 21:03:14 -0700 |
| commit | 4dc5685220466d67bb009c3dec08d8a89aeddd0e (patch) | |
| tree | aa7f6fbcbc91ad571c791d9e880d98b93dd717eb /src | |
| parent | 9491f18c5de3ff1c4bf9c3fdacf52d9859e26f7c (diff) | |
| download | rust-4dc5685220466d67bb009c3dec08d8a89aeddd0e.tar.gz rust-4dc5685220466d67bb009c3dec08d8a89aeddd0e.zip | |
Add option for local docker testing.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/run.sh | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index d891ad1b668..8071b635804 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -5,7 +5,27 @@ set -e export MSYS_NO_PATHCONV=1 script=`cd $(dirname $0) && pwd`/`basename $0` -image=$1 + +image="" +dev=0 + +while [[ $# -gt 0 ]] +do + case "$1" in + --dev) + dev=1 + ;; + *) + if [ -n "$image" ] + then + echo "expected single argument for the image name" + exit 1 + fi + image="$1" + ;; + esac + shift +done docker_dir="`dirname $script`" ci_dir="`dirname $docker_dir`" @@ -163,6 +183,15 @@ else args="$args --env LOCAL_USER_ID=`id -u`" fi +if [ "$dev" = "1" ] +then + # Interactive + TTY + args="$args -it" + command="/bin/bash" +else + command="/checkout/src/ci/run.sh" +fi + docker \ run \ --workdir /checkout/obj \ @@ -183,7 +212,7 @@ docker \ --init \ --rm \ rust-ci \ - /checkout/src/ci/run.sh + $command if [ -f /.dockerenv ]; then rm -rf $objdir |