Added importImage to support creating images from tar files

recampbell · recampbell · commit 9be43bcf903c · 2014-02-27T10:25:04.000-08:00
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -30,6 +30,7 @@
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.UUID;
 
@@ -150,6 +151,39 @@ public ClientResponse pull(String repository, String tag, String registry) throw
         }
     }
 
+    /**
+     * Create an image by importing the given stream of a tar file.
+     *
+     * @param repository the repository to import to
+     * @param tag any tag for this image
+     * @param imageStream the InputStream of the tar file
+     * @return an {@link ImageCreateResponse} containing the id of the imported image
+     * @throws DockerException if the import fails for some reason.
+     */
+    public ImageCreateResponse importImage(String repository, String tag, InputStream imageStream) throws DockerException {
+        Preconditions.checkNotNull(repository, "Repository was not specified");
+        Preconditions.checkNotNull(imageStream, "imageStream was not provided");
+
+        MultivaluedMap<String,String> params = new MultivaluedMapImpl();
+        params.add("repo", repository);
+        params.add("tag", tag);
+        params.add("fromSrc","-");
+
+        WebResource webResource = client.resource(restEndpointUrl + "/images/create").queryParams(params);
+
+        try {
+            LOGGER.trace("POST: {}", webResource);
+            return webResource.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(ImageCreateResponse.class,imageStream);
+
+        } catch (UniformInterfaceException exception) {
+            if (exception.getResponse().getStatus() == 500) {
+                throw new DockerException("Server error.", exception);
+            } else {
+                throw new DockerException(exception);
+            }
+        }
+    }
+
     public List<SearchItem> search(String search) throws DockerException {
         WebResource webResource = client.resource(restEndpointUrl + "/images/search").queryParam("term", search);
         try {
diff --git a/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java b/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java
@@ -0,0 +1,30 @@
+package com.kpelykh.docker.client.model;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.Arrays;
+
+/**
+ * Parse reponses from /images/create
+ *
+ * @author Ryan Campbell (ryan.campbell@gmail.com)
+ *
+ */
+public class ImageCreateResponse {
+
+    @JsonProperty("status")
+    private String id;
+
+
+    public String getId() {
+        return id;
+    }
+
+
+    @Override
+    public String toString() {
+        return "ContainerCreateResponse{" +
+                "id='" + id + '\'' +
+                '}';
+    }
+}
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -629,6 +629,13 @@ public void testDockerBuilderAddFolder() throws DockerException, IOException {
         dockerfileBuild(baseDir, "Successfully executed testAddFolder.sh");
     }
 
+    @Test
+    public void testImportImageFromTar() throws DockerException, IOException {
+        InputStream tar = Thread.currentThread().getContextClassLoader().getResourceAsStream("testImportImageFromTar/empty.tar");
+        String imageId = dockerClient.importImage("empty", null, tar).getId();
+        assert imageId.contains(dockerClient.inspectImage("empty").getId());
+    }
+
     @Test
     public void testNetCatDockerfileBuilder() throws DockerException, IOException, InterruptedException {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
diff --git a/src/test/resources/testImportImageFromTar/empty.tar b/src/test/resources/testImportImageFromTar/empty.tar
