push support

alexec · alexec · commit e418e2e00f41 · 2014-04-27T02:08:58.000+01:00
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -242,7 +242,7 @@ public void push(final String name) throws DockerException {
 		}
 		try {
 			final String registryAuth = registryAuth();
-			client.resource(restEndpointUrl + "/images/" + name + "/push")
+			client.resource(restEndpointUrl + "/images/" + name(name) + "/push")
 					.header("X-Registry-Auth", registryAuth)
 					.accept(MediaType.APPLICATION_JSON)
 					.post();
@@ -251,6 +251,10 @@ public void push(final String name) throws DockerException {
 		}
 	}
 
+	private String name(String name) {
+		return name.contains("/") ? name : authConfig.getUsername();
+	}
+
 	/**
 	 * Create an image by importing the given stream of a tar file.
 	 *
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerPushTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerPushTest.java
@@ -23,7 +23,7 @@ public void beforeTest() throws Exception {
 	@Test
 	public void testPushLatest() throws Exception {
 		setUpCredentials();
-		docker.push("alexec/busybox");
+		docker.push("busybox");
 		assertThat(asString(docker.pull("alexec/busybox")), not(containsString("404")));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public void push(final String name) throws DockerException {`
`242`	`242`	`}`
`243`	`243`	`try {`
`244`	`244`	`final String registryAuth = registryAuth();`
`245`		`- client.resource(restEndpointUrl + "/images/" + name + "/push")`
	`245`	`+ client.resource(restEndpointUrl + "/images/" + name(name) + "/push")`
`246`	`246`	`.header("X-Registry-Auth", registryAuth)`
`247`	`247`	`.accept(MediaType.APPLICATION_JSON)`
`248`	`248`	`.post();`
`@@ -251,6 +251,10 @@ public void push(final String name) throws DockerException {`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
	`254`	`+ private String name(String name) {`
	`255`	`+ return name.contains("/") ? name : authConfig.getUsername();`
	`256`	`+ }`
	`257`	`+`
`254`	`258`	`/**`
`255`	`259`	`* Create an image by importing the given stream of a tar file.`
`256`	`260`	`*`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void beforeTest() throws Exception {`
`23`	`23`	`@Test`
`24`	`24`	`public void testPushLatest() throws Exception {`
`25`	`25`	`setUpCredentials();`
`26`		`- docker.push("alexec/busybox");`
	`26`	`+ docker.push("busybox");`
`27`	`27`	`assertThat(asString(docker.pull("alexec/busybox")), not(containsString("404")));`
`28`	`28`	`}`
`29`	`29`