Skip to content

Merge #1

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 4 commits into from
Jun 10, 2014
Merged

Merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9aa7c50
Add ping method
vjuranek Jun 8, 2014
c76d2dd
Merge pull request #65 from vjuranek/ping
marcuslinke Jun 9, 2014
1a997a0
add tag method on image
ydubreuil Jun 10, 2014
8f49622
Merge pull request #66 from ydubreuil/add-tag-method
marcuslinke Jun 10, 2014
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
43 changes: 43 additions & 0 deletions src/main/java/com/kpelykh/docker/client/DockerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}


/**
Expand Down Expand Up @@ -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.
*
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 ## ################
Expand Down