From cdae1067c3e7b55c3c4ffa115d7df1a6d22145d8 Mon Sep 17 00:00:00 2001
From: Gabriel <g2p.code@gmail.com>
Date: Sun, 10 Mar 2019 19:57:56 +0100
Subject: 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>
---
 kokoro/kokoro_simulator.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kokoro')

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
-- 
cgit 1.4.1