Skip to content

Fixes to AttachContainerCmd and CreateContainerCmd. #46

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
Aug 25, 2014
Merged

Fixes to AttachContainerCmd and CreateContainerCmd. #46

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
7 changes: 6 additions & 1 deletion 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
Expand Up @@ -55,6 +55,10 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{

public CreateContainerCmd withMemorySwap(long memorySwap);

public int getCpuShares();

public CreateContainerCmd withCpuShares(int cpuShares);

public boolean isAttachStdin();

public CreateContainerCmd withAttachStdin(boolean attachStdin);
Expand Down Expand Up @@ -96,10 +100,11 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
* @throws NotFoundException No such container
* @throws ConflictException Named container already exists
*/
@Override
public CreateContainerResponse exec() throws NotFoundException,
ConflictException;

public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
}

}
}
11 changes: 11 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 @@ -29,6 +29,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
@JsonProperty("User") private String user = "";
@JsonProperty("Memory") private long memoryLimit = 0;
@JsonProperty("MemorySwap") private long memorySwap = 0;
@JsonProperty("CpuShares") private int cpuShares = 0;
@JsonProperty("AttachStdin") private boolean attachStdin = false;
@JsonProperty("AttachStdout") private boolean attachStdout = false;
@JsonProperty("AttachStderr") private boolean attachStderr = false;
Expand Down Expand Up @@ -188,6 +189,16 @@ public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
return this;
}

@Override
public int getCpuShares() {
return cpuShares;
}

@Override
public CreateContainerCmdImpl withCpuShares(int cpuShares) {
this.cpuShares = cpuShares;
return this;
}

@Override
public boolean isAttachStdin() {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ public AttachContainerCmdExec(WebTarget baseResource) {
@Override
public InputStream exec(AttachContainerCmd command) {
WebTarget webResource = getBaseResource().path("/containers/{id}/attach")
.resolveTemplate("{id}", command.getContainerId())
.resolveTemplate("id", command.getContainerId())
.queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
.queryParam("timestamps",command.hasTimestampsEnabled() ? "1" : "0")
// .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
.queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0");
.queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");

LOGGER.trace("POST: {}", webResource);

Expand Down