diff options
author | gnzlbg <gonzalobg88@gmail.com> | 2018-11-19 15:49:56 +0100 |
---|---|---|
committer | gnzlbg <gonzalobg88@gmail.com> | 2018-11-20 10:25:26 +0100 |
commit | 37a0bd3251aa5942831d1fdfab8b44b76804e0d9 (patch) | |
tree | d9cf594de32e2feb4e91c863fb193d2e43c2e29f /ci/run-docker.sh | |
parent | aca32d997cd738d0e59f5c28f56883ba948f95c3 (diff) | |
download | rust-libc-37a0bd3251aa5942831d1fdfab8b44b76804e0d9.tar.gz |
Fix shellcheck issues
Diffstat (limited to 'ci/run-docker.sh')
-rwxr-xr-x | ci/run-docker.sh | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/ci/run-docker.sh b/ci/run-docker.sh index 662a1d491a..4247827f67 100755 --- a/ci/run-docker.sh +++ b/ci/run-docker.sh @@ -1,36 +1,41 @@ +#!/usr/bin/env sh + # Small script to run tests for a target (or all targets) inside all the # respective docker images. set -ex run() { - echo $1 + echo "Building docker container for target ${1}" # use -f so we can use ci/ as build context - docker build -t libc -f ci/docker/$1/Dockerfile ci/ + docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/ mkdir -p target if [ -w /dev/kvm ]; then - kvm="--volume /dev/kvm:/dev/kvm" + kvm="--volume /dev/kvm:/dev/kvm" + else + kvm="" fi + docker run \ - --user `id -u`:`id -g` \ + --user "$(id -u)":"$(id -g)" \ --rm \ --init \ - --volume $HOME/.cargo:/cargo \ + --volume "${HOME}/.cargo":/cargo \ $kvm \ --env CARGO_HOME=/cargo \ - --volume `rustc --print sysroot`:/rust:ro \ - --volume `pwd`:/checkout:ro \ - --volume `pwd`/target:/checkout/target \ + --volume "$(rustc --print sysroot)":/rust:ro \ + --volume "$(pwd)":/checkout:ro \ + --volume "$(pwd)"/target:/checkout/target \ --env CARGO_TARGET_DIR=/checkout/target \ --workdir /checkout \ libc \ - ci/run.sh $1 + ci/run.sh "${1}" } -if [ -z "$1" ]; then - for d in `ls ci/docker/`; do - run $d +if [ -z "${1}" ]; then + for d in ci/docker/*; do + run "${d}" done else - run $1 + run "${1}" fi |