Merge pull request docker-java#2 from kpelykh/master

marcuslinke · marcuslinke · commit 8ce12d6fa9bb · 2014-06-10T20:33:48.000+02:00
Merge
diff --git a/README.md b/README.md
@@ -14,13 +14,9 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/
 * Maven 3.0.5
 * Docker daemon running
 
-Maven will run tests during build process. Tests are using localhost instance of Docker, make sure that
-you have Docker running for tests to work or just turn off tests.
-
-If you don't have Docker running locally, you can skip tests with -DskipTests flag set to true:
-
-    $ mvn clean install -DskipTests=true
+Maven may run tests during build process but tests are disabled by default. The tests are using a localhost instance of Docker, make sure that you have Docker running for tests to work. To run the tests you have to provide your https://www.docker.io/account/login/ information:
 
+    $ mvn clean install -DskipTests=false -Ddocker.io.username=... -Ddocker.io.password=... -Ddocker.io.email=...
 
 By default Docker server is using UNIX sockets for communication with the Docker client, however docker-java
 client uses TCP/IP to connect to the Docker server, so you will need to make sure that your Docker server is
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -190,6 +190,19 @@ public Version version() throws DockerException {
 			}
 		}
 	}
+	
+	
+	public int ping() throws DockerException {
+		WebResource webResource = client.resource(restEndpointUrl + "/_ping");
+	    
+		try {
+			LOGGER.trace("GET: {}", webResource);
+			ClientResponse resp = webResource.get(ClientResponse.class);
+			return resp.getStatus();
+		} catch (UniformInterfaceException exception) {
+			throw new DockerException(exception);
+		}
+	}
 
 
 	/**
@@ -280,6 +293,36 @@ private String name(String name) {
 		return name.contains("/") ? name : authConfig.getUsername();
 	}
 
+	/**
+	 * Tag an image into a repository
+	 *
+	 * @param image       the local image to tag (either a name or an id)
+	 * @param repository  the repository to tag in
+	 * @param tag         any tag for this image
+	 * @param force       (not documented)
+	 * @return the HTTP status code (201 for success)
+	 */
+	public int tag(String image, String repository, String tag, boolean force) throws DockerException {
+		Preconditions.checkNotNull(image, "image was not specified");
+		Preconditions.checkNotNull(repository, "repository was not specified");
+		Preconditions.checkNotNull(tag, " tag was not provided");
+
+		MultivaluedMap<String, String> params = new MultivaluedMapImpl();
+		params.add("repo", repository);
+		params.add("tag", tag);
+		params.add("force", String.valueOf(force));
+
+		WebResource webResource = client.resource(restEndpointUrl + "/images/" + image + "/tag").queryParams(params);
+	    
+		try {
+			LOGGER.trace("POST: {}", webResource);
+			ClientResponse resp = webResource.post(ClientResponse.class);
+			return resp.getStatus();
+		} catch (UniformInterfaceException exception) {
+			throw new DockerException(exception);
+		}
+	}
+
 	/**
 	 * Create an image by importing the given stream of a tar file.
 	 *
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -25,10 +25,12 @@
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
 import java.util.List;
+import java.util.Random;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.RandomUtils;
 import org.hamcrest.Matcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -569,6 +571,16 @@ public void testRemoveImage() throws DockerException, InterruptedException {
 		assertThat(containers, matcher);
 	}
 
+	@Test
+	public void testTagImage() throws DockerException, InterruptedException {
+		String tag = String.valueOf(RandomUtils.nextInt(Integer.MAX_VALUE));
+		
+		Integer result = dockerClient.tag("busybox:latest", "docker-java/busybox", tag, false);
+		assertThat(result, equalTo(Integer.valueOf(201)));
+		
+		dockerClient.removeImage("docker-java/busybox:" + tag);
+	}
+
 	/*
 	 * 
 	 * ################ ## MISC TESTS ## ################
