Skip to content

add support for some missing API entries #960

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

Closed
troubadout wants to merge 2 commits into from
Closed

add support for some missing API entries #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d941624
introduce support for IPC mode
Dec 5, 2017
f45a55b
introduce support for Env in docker exec create
Dec 5, 2017
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
5 changes: 5 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
@CheckForNull
Boolean getPrivileged();

@CheckForNull
String[] getEnv();

ExecCreateCmd withAttachStderr(Boolean attachStderr);

ExecCreateCmd withAttachStdin(Boolean attachStdin);
Expand All @@ -42,6 +45,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {

ExecCreateCmd withPrivileged(Boolean isPrivileged);

ExecCreateCmd withEnv(String... env);

interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
}

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/HostConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ public class HostConfig implements Serializable {
@JsonProperty("PidMode")
private String pidMode;

@JsonProperty("IpcMode")
private String ipcMode;

/**
* @since {@link RemoteApiVersion#VERSION_1_20}
*/
Expand Down Expand Up @@ -301,6 +304,11 @@ public String getPidMode() {
return pidMode;
}

@CheckForNull
public String getIpcMode() {
return ipcMode;
}

/**
* @see #blkioDeviceReadBps
*/
Expand Down Expand Up @@ -705,6 +713,14 @@ public HostConfig withPidMode(String pidMode) {
return this;
}

/**
* @see #ipcMode
*/
public HostConfig withIpcMode(String ipcMode) {
this.ipcMode = ipcMode;
return this;
}

/**
* @see #portBindings
*/
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
@JsonProperty("Cmd")
private String[] cmd;

/**
* @since {@link RemoteApiVersion#VERSION_1_25}
*/
@JsonProperty("Env")
private String[] env;

public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
super(exec);
withContainerId(containerId);
Expand Down Expand Up @@ -95,6 +101,12 @@ public ExecCreateCmd withPrivileged(Boolean privileged) {
return this;
}

@Override
public ExecCreateCmd withEnv(String... env) {
this.env = env;
return this;
}

@Override
public String getContainerId() {
return containerId;
Expand Down Expand Up @@ -130,6 +142,11 @@ public String getUser() {
return user;
}

@Override
public String[] getEnv() {
return env;
}

/**
* @throws NotFoundException
* No such container
Expand Down