Skip to content

Added withPull method to BuilImageCmd #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 1 commit into from
Apr 1, 2015
Merged

Added withPull method to BuilImageCmd #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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> {
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -115,6 +117,11 @@ public boolean hasRemoveEnabled() {
public boolean isQuiet() {
return quiet;
}

@Override
public boolean hasPullEnabled() {
return pull;
}

@Override
public String getPathToDockerfile() {
Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down