Merge pull request #1919 from HubSpot/skip-shell-cmd-prefix-for-docke…

…r-only Configurably skip shell command prefix for Docker tasks only.
HubSpot · Apr 16, 2019 · d332fc3 · d332fc3
2 parents 1e86910 + 7cd6458
commit d332fc3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...va/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java b/...va/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java
@@ -27,6 +27,9 @@ public class SingularityExecutorShellCommandDescriptor {
   @JsonProperty
   private boolean skipCommandPrefix = false;
 
+  @JsonProperty
+  private boolean skipCommandPrefixDockerOnly = false;
+
   public List<SingularityExecutorShellCommandOptionDescriptor> getOptions() {
     return options;
   }
@@ -58,4 +61,12 @@ public boolean isSkipCommandPrefix() {
   public void setSkipCommandPrefix(boolean skipCommandPrefix) {
     this.skipCommandPrefix = skipCommandPrefix;
   }
+
+  public boolean isSkipCommandPrefixDockerOnly() {
+    return skipCommandPrefixDockerOnly;
+  }
+
+  public void setSkipCommandPrefixDockerOnly(boolean skipCommandPrefixDockerOnly) {
+    this.skipCommandPrefixDockerOnly = skipCommandPrefixDockerOnly;
+  }
 }
diff --git a/...n/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java b/...n/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java
@@ -143,13 +143,15 @@ public boolean apply(SingularityExecutorShellCommandDescriptor input) {
 
     List<String> command = new ArrayList<>();
 
-    if (!shellCommandDescriptor.isSkipCommandPrefix()) {
-      command.addAll(executorConfiguration.getShellCommandPrefix());
-    }
-
     boolean isDocker = task.getTaskInfo().hasContainer() && task.getTaskInfo().getContainer().hasDocker();
     if (isDocker) {
+      if (!shellCommandDescriptor.isSkipCommandPrefix() && !shellCommandDescriptor.isSkipCommandPrefixDockerOnly()) {
+        command.addAll(executorConfiguration.getShellCommandPrefix());
+      }
+
       command.addAll(Arrays.asList("docker", "exec", String.format("%s%s", executorConfiguration.getDockerPrefix(), task.getTaskId())));
+    } else if (!shellCommandDescriptor.isSkipCommandPrefix()) {
+      command.addAll(executorConfiguration.getShellCommandPrefix());
     }
 
     command.addAll(shellCommandDescriptor.getCommand());