[JENKINS-23025] Allow container IDs contain env. variables

jenkinsci · May 18, 2014 · d1e4d11 · d1e4d11
1 parent 2a458c7
commit d1e4d11
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StartByImageIdCommand.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StartByImageIdCommand.java
@@ -7,6 +7,7 @@
 
 import org.jenkinsci.plugins.dockerbuildstep.action.EnvInvisibleAction;
 import org.jenkinsci.plugins.dockerbuildstep.log.ConsoleLogger;
+import org.jenkinsci.plugins.dockerbuildstep.util.Resolver;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.kpelykh.docker.client.DockerClient;
@@ -41,6 +42,8 @@ public void execute(@SuppressWarnings("rawtypes") AbstractBuild build, ConsoleLo
             throw new IllegalArgumentException("At least one parameter is required");
         }
 
+        imageId = Resolver.buildVar(build, imageId);
+
         DockerClient client = getClient();
         List<Container> containers = getClient().listContainers(true);
         for (Container c : containers) {

diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StartCommand.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StartCommand.java
@@ -10,6 +10,7 @@
 import org.jenkinsci.plugins.dockerbuildstep.action.EnvInvisibleAction;
 import org.jenkinsci.plugins.dockerbuildstep.log.ConsoleLogger;
 import org.jenkinsci.plugins.dockerbuildstep.util.PortUtils;
+import org.jenkinsci.plugins.dockerbuildstep.util.Resolver;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.kpelykh.docker.client.DockerClient;
@@ -51,6 +52,8 @@ public void execute(@SuppressWarnings("rawtypes") AbstractBuild build, ConsoleLo
             throw new IllegalArgumentException("At least one parameter is required");
         }
 
+        containerIds = Resolver.buildVar(build, containerIds);
+
         List<String> ids = Arrays.asList(containerIds.split(","));
         DockerClient client = getClient();
         //TODO check, if container exists and is stopped (probably catch exception)

diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StopByImageIdCommand.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StopByImageIdCommand.java
@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.jenkinsci.plugins.dockerbuildstep.log.ConsoleLogger;
+import org.jenkinsci.plugins.dockerbuildstep.util.Resolver;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.kpelykh.docker.client.DockerClient;
@@ -38,6 +39,8 @@ public void execute(@SuppressWarnings("rawtypes") AbstractBuild build, ConsoleLo
             throw new IllegalArgumentException("At least one parameter is required");
         }
 
+        imageId = Resolver.buildVar(build, imageId);
+
         DockerClient client = getClient();
         List<Container> containers = getClient().listContainers(false);
         for (Container c : containers) {

diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StopCommand.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/cmd/StopCommand.java
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import org.jenkinsci.plugins.dockerbuildstep.log.ConsoleLogger;
+import org.jenkinsci.plugins.dockerbuildstep.util.Resolver;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.kpelykh.docker.client.DockerClient;
@@ -40,6 +41,8 @@ public void execute(@SuppressWarnings("rawtypes") AbstractBuild build, ConsoleLo
             throw new IllegalArgumentException("At least one parameter is required");
         }
 
+        containerIds = Resolver.buildVar(build, containerIds);
+
         List<String> ids = Arrays.asList(containerIds.split(","));
         DockerClient client = getClient();
         //TODO check, if container is actually running

diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/util/Resolver.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/util/Resolver.java
@@ -0,0 +1,25 @@
+package org.jenkinsci.plugins.dockerbuildstep.util;
+
+import hudson.Util;
+import hudson.model.AbstractBuild;
+import hudson.util.VariableResolver;
+
+/**
+ * Convenient class for resolving/expanding various variabales.
+ * 
+ * @author vjuranek
+ * 
+ */
+public class Resolver {
+
+    public static String buildVar(final AbstractBuild<?, ?> build,final String toResolve) {
+        VariableResolver<String> vr = build.getBuildVariableResolver();
+        String resolved = Util.replaceMacro(toResolve, vr);
+        try {
+            resolved = build.getEnvironment().expand(resolved);  //TODO avoid deprecated method
+        } catch (Exception e) {
+            //TODO no-op?
+        }
+        return resolved;
+    }
+}