X Tutup
Skip to content

Add a build command accepting a tar as a InputStream, so we can build the Dockerfile TAR on the fly without a temporary folder. #9

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
Jun 19, 2014
Merged

Add a build command accepting a tar as a InputStream, so we can build the Dockerfile TAR on the fly without a temporary folder. #9

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
6 changes: 5 additions & 1 deletion src/main/java/com/github/dockerjava/client/DockerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.apache.http.impl.conn.PoolingClientConnectionManager;

import com.github.dockerjava.client.command.AbstrDockerCmd;
import com.github.dockerjava.client.command.AttachContainerCmd;
import com.github.dockerjava.client.command.AuthCmd;
import com.github.dockerjava.client.command.BuildImgCmd;
import com.github.dockerjava.client.command.CommitCmd;
Expand All @@ -32,7 +33,6 @@
import com.github.dockerjava.client.command.KillContainerCmd;
import com.github.dockerjava.client.command.ListContainersCmd;
import com.github.dockerjava.client.command.ListImagesCmd;
import com.github.dockerjava.client.command.AttachContainerCmd;
import com.github.dockerjava.client.command.LogContainerCmd;
import com.github.dockerjava.client.command.PullImageCmd;
import com.github.dockerjava.client.command.PushImageCmd;
Expand Down Expand Up @@ -326,6 +326,10 @@ public BuildImgCmd buildImageCmd(File dockerFolder) {
return new BuildImgCmd(dockerFolder).withBaseResource(baseResource);
}

public BuildImgCmd buildImageCmd(InputStream tarInputStream) {
return new BuildImgCmd(tarInputStream).withBaseResource(baseResource);
}

public TopContainerCmd topContainerCmd(String containerId) {
return new TopContainerCmd(containerId).withBaseResource(baseResource);
}
Expand Down
73 changes: 46 additions & 27 deletions src/main/java/com/github/dockerjava/client/command/BuildImgCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
Expand Down Expand Up @@ -33,7 +34,8 @@ public class BuildImgCmd extends AbstrDockerCmd<BuildImgCmd, ClientResponse> {

private static final Logger LOGGER = LoggerFactory.getLogger(BuildImgCmd.class);

private File dockerFolder;
private File dockerFolder = null;
private InputStream tarInputStream = null;
private String tag;
private boolean noCache;

Expand All @@ -43,6 +45,11 @@ public BuildImgCmd(File dockerFolder) {
this.dockerFolder = dockerFolder;
}

public BuildImgCmd(InputStream tarInputStream) {
Preconditions.checkNotNull(tarInputStream, "tarInputStream is null");
this.tarInputStream = tarInputStream;
}

public BuildImgCmd withTag(String tag) {
Preconditions.checkNotNull(tag, "Tag is null");
this.tag = tag;
Expand All @@ -55,17 +62,49 @@ public BuildImgCmd withNoCache(boolean noCache) {
}

protected ClientResponse impl() {

Preconditions.checkArgument(dockerFolder.exists(), "Path %s doesn't exist", dockerFolder);
Preconditions.checkArgument(dockerFolder.isDirectory(), "Folder %s doesn't exist", dockerFolder);
Preconditions.checkState(new File(dockerFolder, "Dockerfile").exists(), "Dockerfile doesn't exist in " + dockerFolder);

if (tarInputStream == null) {
File dockerFolderTar = buildDockerFolderTar();
try {
return callDocker(FileUtils.openInputStream(dockerFolderTar));
} catch (IOException e) {
throw new DockerException(e);
} finally {
FileUtils.deleteQuietly(dockerFolderTar);
}
} else {
return callDocker(tarInputStream);
}
}

protected ClientResponse callDocker(final InputStream dockerFolderTarInputStream) {
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
params.add("t", tag);
if (noCache) {
params.add("nocache", "true");
}

WebResource webResource = baseResource.path("/build").queryParams(params);

try {
LOGGER.trace("POST: {}", webResource);
return webResource
.type("application/tar")
.accept(MediaType.TEXT_PLAIN)
.post(ClientResponse.class, dockerFolderTarInputStream);
} catch (UniformInterfaceException exception) {
if (exception.getResponse().getStatus() == 500) {
throw new DockerException("Server error", exception);
} else {
throw new DockerException(exception);
}
}
}

protected File buildDockerFolderTar() {
Preconditions.checkArgument(dockerFolder.exists(), "Path %s doesn't exist", dockerFolder);
Preconditions.checkArgument(dockerFolder.isDirectory(), "Folder %s doesn't exist", dockerFolder);
Preconditions.checkState(new File(dockerFolder, "Dockerfile").exists(), "Dockerfile doesn't exist in " + dockerFolder);

// ARCHIVE TAR
String archiveNameWithOutExtension = UUID.randomUUID().toString();

Expand Down Expand Up @@ -112,31 +151,11 @@ protected ClientResponse impl() {
}

dockerFolderTar = CompressArchiveUtil.archiveTARFiles(dockerFolder, filesToAdd, archiveNameWithOutExtension);

return dockerFolderTar;
} catch (IOException ex) {
FileUtils.deleteQuietly(dockerFolderTar);
throw new DockerException("Error occurred while preparing Docker context folder.", ex);
}

WebResource webResource = baseResource.path("/build").queryParams(params);

try {
LOGGER.trace("POST: {}", webResource);
return webResource
.type("application/tar")
.accept(MediaType.TEXT_PLAIN)
.post(ClientResponse.class, FileUtils.openInputStream(dockerFolderTar));
} catch (UniformInterfaceException exception) {
if (exception.getResponse().getStatus() == 500) {
throw new DockerException("Server error", exception);
} else {
throw new DockerException(exception);
}
} catch (IOException e) {
throw new DockerException(e);
} finally {
FileUtils.deleteQuietly(dockerFolderTar);
}
}

private static boolean isFileResource(String resource) {
Expand Down
X Tutup