Merge pull request #186 from docker-java/issue-184

marcuslinke · marcuslinke · commit 47cefcdf87cd · 2015-04-01T23:23:40.000+02:00
Added withPull method to BuilImageCmd
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -25,8 +25,10 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
 	public boolean hasNoCacheEnabled();
 
 	public boolean hasRemoveEnabled();
-
+	
 	public boolean isQuiet();
+	
+	public boolean hasPullEnabled();
 
     public String getPathToDockerfile();
 
@@ -50,6 +52,10 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
 
 	public BuildImageCmd withQuiet(boolean quiet);
 	
+	public BuildImageCmd withPull();
+
+	public BuildImageCmd withPull(boolean pull);
+	
   	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 	
 	public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -24,6 +24,8 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageC
 	private boolean noCache;
 	private boolean remove = true;
 	private boolean quiet;
+	private boolean pull;
+	
 	private AuthConfigurations buildAuthConfigs;
     private File dockerFile;
     private File baseDirectory;
@@ -115,6 +117,11 @@ public boolean hasRemoveEnabled() {
 	public boolean isQuiet() {
 		return quiet;
 	}
+	
+	@Override
+	public boolean hasPullEnabled() {
+		return pull;
+	}
 
     @Override
     public String getPathToDockerfile() {
@@ -165,6 +172,17 @@ public BuildImageCmdImpl withQuiet(boolean quiet) {
 		this.quiet = quiet;
 		return this;
 	}
+	
+	@Override
+	public BuildImageCmdImpl withPull() {
+		return withPull(true);
+	}
+
+	@Override
+	public BuildImageCmdImpl withPull(boolean pull) {
+		this.pull = pull;
+		return this;
+	}
 
 	@Override
 	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -52,6 +52,9 @@ protected ResponseImpl execute(BuildImageCmd command) {
 		if (command.isQuiet()) {
 			webResource = webResource.queryParam("q", "true");
 		}
+		if (command.hasPullEnabled()) {
+			webResource = webResource.queryParam("pull", "true");
+		}
 		if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
 			webResource = webResource.queryParam("dockerfile", dockerFilePath);
 		}

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ protected ResponseImpl execute(BuildImageCmd command) {`
`52`	`52`	`if (command.isQuiet()) {`
`53`	`53`	`webResource = webResource.queryParam("q", "true");`
`54`	`54`	`}`
	`55`	`+ if (command.hasPullEnabled()) {`
	`56`	`+ webResource = webResource.queryParam("pull", "true");`
	`57`	`+ }`
`55`	`58`	`if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {`
`56`	`59`	`webResource = webResource.queryParam("dockerfile", dockerFilePath);`
`57`	`60`	`}`