diff options
| author | Gabriel <g2p.code@gmail.com> | 2019-03-10 19:57:56 +0100 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-12 18:54:16 -0700 |
| commit | cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8 (patch) | |
| tree | abb66b7d9496cadc0a33e53415937a28fe018732 /kokoro | |
| parent | 8d7f4ac63cb345fe5d84600e3b75f2d1b46ebbbe (diff) | |
| download | crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar.gz crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar.bz2 crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar.lz crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar.xz crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.tar.zst crosvm-cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8.zip | |
kokoro: Fix docker build step in simulator script
The old command no longer works as of CL:1419397 because the pkgconfig path in COPY needs to be interpreted relative to the Dockerfile path. The kokoro/README.md instructions were updated in CL:1431356 but the simulator script was not. Patch received via email from Gabriel <g2p.code@gmail.com>. https://github.com/g2p/crosvm/commit/0e6bb00b90d5ee3c002fc95a22217afe90fe0c52 TEST=run kokoro simulator Change-Id: I09d556cab9a4c1942098e0796e39e221f365c3af Reviewed-on: https://chromium-review.googlesource.com/1513497 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Stephen Barber <smbarber@chromium.org>
Diffstat (limited to 'kokoro')
| -rwxr-xr-x | kokoro/kokoro_simulator.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kokoro/kokoro_simulator.sh b/kokoro/kokoro_simulator.sh index 681ce89..5303c5c 100755 --- a/kokoro/kokoro_simulator.sh +++ b/kokoro/kokoro_simulator.sh @@ -16,7 +16,7 @@ main() { mkdir -p "${kokoro_simulator_root}" if [[ ! -e "${base_image_tarball}" ]]; then if [[ "$(docker images -q ${base_image} 2> /dev/null)" == "" ]]; then - docker build -t ${base_image} - < Dockerfile + docker build -t ${base_image} . fi docker save ${base_image} | xz -T 0 -z >"${base_image_tarball}" fi |