Skip to content

Add labels to create and inspect container #260

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 1 commit into from
Jul 7, 2015
+56 −0
Merged

Add labels to create and inspect container #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.github.dockerjava.api.command;

import java.util.Map;

import com.github.dockerjava.api.ConflictException;
import com.github.dockerjava.api.NotFoundException;
import com.github.dockerjava.api.model.Bind;
Expand Down Expand Up @@ -173,6 +175,8 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon

public CreateContainerCmd withImage(String image);

public CreateContainerCmd withLabels(Map<String, String> labels);

/**
* Add link to another container.
*/
Expand Down Expand Up @@ -238,4 +242,9 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon

public CreateContainerCmd withMacAddress(String macAddress);

/**
* @return
*/
Map<String, String> getLabels();

}
7 changes: 7 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ public class ContainerConfig {
@JsonProperty("Image")
private String image;

@JsonProperty("Labels")
private Map<String, String> labels;

@JsonProperty("MacAddress")
private String macAddress;

Expand Down Expand Up @@ -184,6 +187,10 @@ public String[] getOnBuild() {
return onBuild;
}

public Map<String, String> getLabels() {
return labels;
}

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import static com.google.common.base.Preconditions.checkNotNull;

import java.util.Map;

import org.apache.commons.lang.builder.ToStringBuilder;

import com.fasterxml.jackson.annotation.JsonIgnore;
Expand Down Expand Up @@ -107,6 +109,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
@JsonProperty("HostConfig")
private HostConfig hostConfig = new HostConfig();

@JsonProperty("Labels")
private Map<String, String> labels;

public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
super(exec);
checkNotNull(image, "image was not specified");
Expand Down Expand Up @@ -221,6 +226,12 @@ public Link[] getLinks() {
return hostConfig.getLinks();
}

@Override
@JsonIgnore
public Map<String, String> getLabels() {
return labels;
}

@Override
@JsonIgnore
public LxcConf[] getLxcConf() {
Expand Down Expand Up @@ -471,6 +482,13 @@ public CreateContainerCmdImpl withImage(String image) {
return this;
}

@Override
public CreateContainerCmdImpl withLabels(Map<String, String> labels) {
checkNotNull(labels, "labels was not specified");
this.labels = labels;
return this;
}

@Override
public CreateContainerCmdImpl withLinks(Link... links) {
checkNotNull(links, "links was not specified");
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import java.lang.reflect.Method;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

import static com.github.dockerjava.api.model.Capability.MKNOD;
Expand Down Expand Up @@ -490,4 +492,24 @@ public void createContainerWithULimits() throws DockerException {

}

@Test
public void createContainerWithLabels() throws DockerException {

Map<String, String> labels = new HashMap<String, String>();
labels.put("com.github.dockerjava.null", null);
labels.put("com.github.dockerjava.boolean", "true");

CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
.withLabels(labels).exec();

LOG.info("Created container {}", container.toString());

assertThat(container.getId(), not(isEmptyString()));

InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();

// null becomes empty string
labels.put("com.github.dockerjava.null", "");
assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
}
}