From 001543159a8e89de5713896949be42322f379da1 Mon Sep 17 00:00:00 2001
From: Ivan Barba <ibarba@google.com>
Date: Fri, 20 Mar 2026 23:29:11 +0000
Subject: [PATCH 1/2] Refactor docker mount check for swarming support

---
 docker/base/setup_common.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/docker/base/setup_common.sh b/docker/base/setup_common.sh
index 397ca3c9957..3fe4d3069ea 100644
--- a/docker/base/setup_common.sh
+++ b/docker/base/setup_common.sh
@@ -34,9 +34,22 @@ then
 fi
 
 # Make sure mounted volume doesn't have noexec,nosuid,nodev
-# Running this in k8s environment will cause mounting errors
-if [[ -z "$IS_K8S_ENV" ]]
-then
+# Running this in k8s or swarming environment will cause mounting errors
+should_mount() {
+  # Skip if running in Kubernetes
+  if [[ -n "$IS_K8S_ENV" ]]; then
+    return 1
+  fi
+
+  # Skip if running as a Swarming Job
+  if [[ "$SWARMING_BOT" == "True" ]] || [[ "$SWARMING_BOT" == "1" ]] || [[ "$SWARMING_BOT" == "true" ]]; then
+    return 1
+  fi
+
+  return 0
+}
+
+if should_mount; then
   mount /mnt/scratch0 -o remount,exec,suid,dev
 fi
 

From aad4d858aef3d80fd117e0153368e82d2258e4b8 Mon Sep 17 00:00:00 2001
From: Ivan Barba <ibarba@google.com>
Date: Mon, 23 Mar 2026 18:32:02 +0000
Subject: [PATCH 2/2] Simplifies truthy check for mount conditional

---
 docker/base/setup_common.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/base/setup_common.sh b/docker/base/setup_common.sh
index 3fe4d3069ea..d92034b4c30 100644
--- a/docker/base/setup_common.sh
+++ b/docker/base/setup_common.sh
@@ -33,16 +33,15 @@ then
   export PREEMPTIBLE=True
 fi
 
+is_truthy() {
+  [[ "$1" =~ ^([Tt]rue|1)$ ]]
+}
+
 # Make sure mounted volume doesn't have noexec,nosuid,nodev
 # Running this in k8s or swarming environment will cause mounting errors
 should_mount() {
-  # Skip if running in Kubernetes
-  if [[ -n "$IS_K8S_ENV" ]]; then
-    return 1
-  fi
-
-  # Skip if running as a Swarming Job
-  if [[ "$SWARMING_BOT" == "True" ]] || [[ "$SWARMING_BOT" == "1" ]] || [[ "$SWARMING_BOT" == "true" ]]; then
+  # Skip if running in Kubernetes or as a Swarming Job
+  if is_truthy "$IS_K8S_ENV" || is_truthy "$SWARMING_BOT"; then
     return 1
   fi