diff options
| author | Jianxun Zhang <jianxun.zhang@intel.com> | 2019-08-05 12:26:45 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-07 23:31:48 +0000 |
| commit | 7f855be1f96905c44599b944a0d8449ae528ac39 (patch) | |
| tree | 3034a243b210d8c531e957c4dcd6172c66e49895 | |
| parent | a1b54ce9b58fa5cbf8f1b0487e35bb3b66b2f283 (diff) | |
| download | crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar.gz crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar.bz2 crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar.lz crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar.xz crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.tar.zst crosvm-7f855be1f96905c44599b944a0d8449ae528ac39.zip | |
docker: support passing extra arguments to scripts
One of the usages is to specify proxy setting so that these scripts can download packages behind proxies. It looks cleaner and more flexible than tweaking the docker file that's checked in the repo. BUG=None TEST=run commands behind a network proxy ./build_crosvm_base.sh --build-arg http_proxy --build-arg https_proxy ./build_crosvm.sh --build-arg http_proxy --build-arg https_proxy ./wrapped_smoke_test.sh -e http_proxy -e https_proxy Change-Id: Id3729a1343b12c1c7553e047701f770620e3c975 Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1737540 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
| -rwxr-xr-x | docker/build_crosvm.sh | 7 | ||||
| -rwxr-xr-x | docker/build_crosvm_base.sh | 2 | ||||
| -rwxr-xr-x | docker/wrapped_smoke_test.sh | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/docker/build_crosvm.sh b/docker/build_crosvm.sh index 3c6d359..e0d697b 100755 --- a/docker/build_crosvm.sh +++ b/docker/build_crosvm.sh @@ -8,4 +8,9 @@ cd "${0%/*}" src_root="$(realpath ..)" -docker build -t crosvm -f Dockerfile.crosvm --build-arg UID --build-arg GID "${src_root}" +docker build -t crosvm \ + -f Dockerfile.crosvm \ + --build-arg UID \ + --build-arg GID \ + "$@" \ + "${src_root}" diff --git a/docker/build_crosvm_base.sh b/docker/build_crosvm_base.sh index 2041384..0e4274e 100755 --- a/docker/build_crosvm_base.sh +++ b/docker/build_crosvm_base.sh @@ -12,4 +12,4 @@ gen_build_args() { done } -docker build $(gen_build_args) -t crosvm-base . +docker build $(gen_build_args) -t crosvm-base "$@" . diff --git a/docker/wrapped_smoke_test.sh b/docker/wrapped_smoke_test.sh index 324ab7c..1ee296b 100755 --- a/docker/wrapped_smoke_test.sh +++ b/docker/wrapped_smoke_test.sh @@ -14,6 +14,7 @@ docker run \ -e TEST_RUNNER_FLAGS='--format terse' \ -v /dev/log:/dev/log \ -v "${src_root}":/platform/crosvm:ro \ + "$@" \ crosvm-base \ bin/smoke_test |