Skip to content

Commit 3d84b5b

Browse files
marcuslinkemarcuslinke
committed
Merge pull request #61 from marcuslinke/master
Various fixes
2 parents 62be275 + 620e456 commit 3d84b5b

6 files changed

Lines changed: 46 additions & 24 deletions

File tree

‎src/main/java/com/kpelykh/docker/client/Config.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,9 @@ static Config createConfig() throws DockerException {
2222
throw new DockerException(e);
2323
}
2424

25-
for (String s : new String[]{"url", "version", "username", "password", "email"}) {
26-
final String key = "docker.io." + s;
27-
if (System.getProperties().keySet().contains(key)) {
28-
p.setProperty(key, System.getProperty(key));
29-
}
30-
}
25+
final File file = new File(System.getProperty("user.home"), ".docker.io.properties");
3126

32-
final File file = new File(System.getProperty("user.name"), ".docker.io.properties");
33-
System.out.println(file);
34-
if (file.isFile()) {
27+
if (file.isFile()) {
3528
try {
3629
final FileInputStream in = new FileInputStream(file);
3730
try {
@@ -44,6 +37,13 @@ static Config createConfig() throws DockerException {
4437
}
4538
}
4639

40+
for (String s : new String[]{"url", "version", "username", "password", "email"}) {
41+
final String key = "docker.io." + s;
42+
if (System.getProperties().keySet().contains(key)) {
43+
p.setProperty(key, System.getProperty(key));
44+
}
45+
}
46+
4747
final Config c = new Config();
4848

4949
c.url = URI.create(p.getProperty("docker.io.url"));

‎src/main/java/com/kpelykh/docker/client/DockerClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void setCredentials(String username, String password, String email) {
108108
}
109109
authConfig = new AuthConfig();
110110
authConfig.setUsername(username);
111-
authConfig.setPassword(password);
111+
authConfig.setPassword(password);
112112
authConfig.setEmail(email);
113113
}
114114

‎src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ContainerInspectResponse {
3333
private ContainerState state;
3434

3535
@JsonProperty("Image")
36-
private String image;
36+
private String imageId;
3737

3838
@JsonProperty("NetworkSettings")
3939
private NetworkSettings networkSettings;
@@ -119,12 +119,12 @@ public void setState(ContainerState state) {
119119
this.state = state;
120120
}
121121

122-
public String getImage() {
123-
return image;
122+
public String getImageId() {
123+
return imageId;
124124
}
125125

126-
public void setImage(String image) {
127-
this.image = image;
126+
public void setImageId(String image) {
127+
this.imageId = image;
128128
}
129129

130130
public NetworkSettings getNetworkSettings() {

‎src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ImageInspectResponse {
2222

2323
@JsonProperty("container_config") private ContainerConfig containerConfig;
2424

25-
@JsonProperty("Size") private int size;
25+
@JsonProperty("Size") private long size;
2626

2727
@JsonProperty("docker_version") private String dockerVersion;
2828

@@ -76,11 +76,11 @@ public void setContainerConfig(ContainerConfig containerConfig) {
7676
this.containerConfig = containerConfig;
7777
}
7878

79-
public int getSize() {
79+
public long getSize() {
8080
return size;
8181
}
8282

83-
public void setSize(int size) {
83+
public void setSize(long size) {
8484
this.size = size;
8585
}
8686

‎src/test/java/com/kpelykh/docker/client/test/AbstractDockerClientTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ public void beforeTest() throws DockerException {
3030
LOG.info("Connecting to Docker server at " + url);
3131
dockerClient = new DockerClient(url);
3232

33-
LOG.info("Creating image 'busybox'");
33+
LOG.info("Pulling image 'busybox'");
3434
// need to block until image is pulled completely
3535
logResponseStream(dockerClient.pull("busybox"));
36+
37+
3638

3739
assertNotNull(dockerClient);
3840
LOG.info("======================= END OF BEFORETEST =======================\n\n");

‎src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,25 +151,45 @@ public void testImages() throws DockerException {
151151

152152
@Test
153153
public void testListContainers() throws DockerException {
154+
155+
String testImage = "hackmann/empty";
156+
157+
LOG.info("Pulling image 'hackmann/empty'");
158+
// need to block until image is pulled completely
159+
logResponseStream(dockerClient.pull(testImage));
160+
tmpImgs.add(testImage);
161+
154162
List<Container> containers = dockerClient.listContainers(true);
155163
assertThat(containers, notNullValue());
156164
LOG.info("Container List: {}", containers);
157165

158166
int size = containers.size();
159167

160168
ContainerConfig containerConfig = new ContainerConfig();
161-
containerConfig.setImage("busybox");
169+
containerConfig.setImage(testImage);
162170
containerConfig.setCmd(new String[] { "echo" });
163171

164172
ContainerCreateResponse container1 = dockerClient
165173
.createContainer(containerConfig);
174+
166175
assertThat(container1.getId(), not(isEmptyString()));
176+
177+
ContainerInspectResponse containerInspectResponse = dockerClient.inspectContainer(container1.getId());
178+
179+
assertThat(containerInspectResponse.getConfig().getImage(), is(equalTo(testImage)));
180+
181+
167182
dockerClient.startContainer(container1.getId());
168183
tmpContainers.add(container1.getId());
169184

170185
LOG.info("container id: " + container1.getId());
171186

172-
List containers2 = dockerClient.listContainers(true);
187+
List<Container> containers2 = dockerClient.listContainers(true);
188+
189+
for(Container container: containers2) {
190+
LOG.info("listContainer: id=" + container.getId() +" image=" + container.getImage());
191+
}
192+
173193
assertThat(size + 1, is(equalTo(containers2.size())));
174194
Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
175195
assertThat(containers2, matcher);
@@ -179,12 +199,12 @@ public void testListContainers() throws DockerException {
179199
assertThat(filteredContainers.size(), is(equalTo(1)));
180200

181201
for(Container container: filteredContainers) {
182-
LOG.info("container: " + container);
202+
LOG.info("filteredContainer: " + container.getImage());
183203
}
184204

185205
Container container2 = filteredContainers.get(0);
186206
assertThat(container2.getCommand(), not(isEmptyString()));
187-
assertThat(container2.getImage(), equalTo("busybox:latest"));
207+
assertThat(container2.getImage(), equalTo(testImage + ":latest"));
188208
}
189209

190210
/*
@@ -232,7 +252,7 @@ public void testStartContainer() throws DockerException {
232252
assertThat(containerInspectResponse.getId(),
233253
startsWith(container.getId()));
234254

235-
assertThat(containerInspectResponse.getImage(), not(isEmptyString()));
255+
assertThat(containerInspectResponse.getImageId(), not(isEmptyString()));
236256
assertThat(containerInspectResponse.getState(), is(notNullValue()));
237257

238258
assertThat(containerInspectResponse.getState().running, is(true));

0 commit comments

Comments
 (0)