From 5bdc167d174515eb51ba1bb0f4b4d1e484e8996c Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Fri, 11 Dec 2020 13:23:27 -0800
Subject: Fix run and sudo targets.

These are not passing arguments properly. This breaks the current
pre-command for BuildKite.

PiperOrigin-RevId: 347062729
---
 .buildkite/hooks/pre-command | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.buildkite')

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 1994287e8..7d277202b 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -4,7 +4,8 @@ PARTITION=$((${PARTITION}+1)) # 1-indexed, but PARALLEL_JOB is 0-indexed.
 export TOTAL_PARTITIONS=${BUILDKITE_PARALLEL_JOB_COUNT:-1}
 
 # Ensure Docker has experimental enabled.
-if ! grep experimental /etc/docker/daemon.json >/dev/null; then
+EXPERIMENTAL=$(sudo docker version --format='{{.Server.Experimental}}')
+if test "${EXPERIMENTAL}" != "true"; then
   make sudo TARGETS=//runsc:runsc ARGS="install --experimental=true"
-  sudo systemctl reload docker
+  sudo systemctl restart docker
 fi
-- 
cgit v1.2.3