Skip to content

Netty implementation of DockerCmdExecFactory #397

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 14 commits into from
Dec 14, 2015
Merged

Netty implementation of DockerCmdExecFactory #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2d828ad
Added AHC dependency
Nov 6, 2015
bc05ff9
start netty implementation (proof of concept)
marcuslinke Nov 13, 2015
4a81097
Removed some debug output
marcuslinke Nov 14, 2015
e7f1724
Fix regression in decode algorithm for docker stream
marcuslinke Nov 14, 2015
f9c5972
Added basic SSL support
Nov 15, 2015
87e398a
Migrated more command exec implementations and tests
Nov 20, 2015
e837b81
WIP
Nov 24, 2015
f0dc0c7
Added missing exec implementations as well as appropriate tests
Nov 29, 2015
ecc2a19
Merge branch 'master' into netty
Dec 10, 2015
a1c7bf5
Added copy archive from/to container command for (netty)
Dec 10, 2015
ca376d6
Added stdin parameter to attach command api, implemented for netty
Dec 11, 2015
feb93a4
Removed println() debugging
Dec 11, 2015
8039e18
Code cleanup
Dec 12, 2015
d5dbb5d
Added some javadoc
Dec 14, 2015
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
32 changes: 31 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -201,6 +202,28 @@
<version>3.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.0.Beta7</version>
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha Dec 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why betas?

Copy link
Copy Markdown
Contributor Author

@marcuslinke marcuslinke Dec 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest netty stable release 4.0.33.FINAL is missing some features that are needed here. It might be possible to backport it from 4.1.0.Beta7 but as it is an experimental implementation of DockerCmdExecFactory I think its OK for now.

Copy link
Copy Markdown
Member

@KostyaSha KostyaSha Dec 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.0.Beta7</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.0.Beta7</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.0.Beta7</version>
<classifier>linux-x86_64</classifier>
</dependency>
</dependencies>

<distributionManagement>
Expand All @@ -215,6 +238,13 @@
</distributionManagement>

<build>
<!-- <extensions> -->
<!-- <extension> -->
<!-- <groupId>kr.motd.maven</groupId> -->
<!-- <artifactId>os-maven-plugin</artifactId> -->
<!-- <version>1.2.3.Final</version> -->
<!-- </extension> -->
<!-- </extensions> -->
<pluginManagement>
<plugins>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
*
*
* @author marcus
* @author Marcus Linke
*
*/
public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
@CheckForNull
public Boolean hasStderrEnabled();

@CheckForNull
public InputStream getStdin();

public AttachContainerCmd withContainerId(@Nonnull String containerId);

/**
Expand All @@ -58,6 +61,8 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F

public AttachContainerCmd withStdErr(Boolean stderr);

public AttachContainerCmd withStdIn(InputStream stdin);

public AttachContainerCmd withLogs(Boolean logs);

public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.github.dockerjava.api.command;

import com.github.dockerjava.api.model.AuthConfigurations;
import com.github.dockerjava.api.model.BuildResponseItem;
import java.io.File;
import java.io.InputStream;
import java.net.URI;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;

import java.io.File;
import java.io.InputStream;
import java.net.URI;
import com.github.dockerjava.api.model.AuthConfigurations;
import com.github.dockerjava.api.model.BuildResponseItem;

/**
* Build an image from Dockerfile.
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.github.dockerjava.api.command;

import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

Expand All @@ -12,4 +15,9 @@ public class ExecCreateCmdResponse {
public String getId() {
return id;
}

@Override
public String toString() {
return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
}
14 changes: 10 additions & 4 deletions src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;

import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.Frame;

public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
public interface ExecStartCmd extends AsyncDockerCmd<ExecStartCmd, Frame> {

@CheckForNull
public String getExecId();
Expand All @@ -18,22 +20,26 @@ public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
@CheckForNull
public Boolean hasTtyEnabled();

@CheckForNull
public InputStream getStdin();

public ExecStartCmd withDetach(Boolean detach);

public ExecStartCmd withExecId(@Nonnull String execId);

public ExecStartCmd withTty(Boolean tty);

public ExecStartCmd withStdIn(InputStream stdin);

/**
* Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
*
* @throws NotFoundException
* No such exec instance
*/
@Override
public InputStream exec() throws NotFoundException;
public <T extends ResultCallback<Frame>> T exec(T resultCallback);

public static interface Exec extends DockerCmdSyncExec<ExecStartCmd, InputStream> {
public static interface Exec extends DockerCmdAsyncExec<ExecStartCmd, Frame> {
}

}
7 changes: 3 additions & 4 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;

import com.github.dockerjava.core.RemoteApiVersion;
import javax.annotation.CheckForNull;

import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
Expand All @@ -20,8 +20,7 @@
import com.github.dockerjava.api.model.VolumeBinds;
import com.github.dockerjava.api.model.VolumeRW;
import com.github.dockerjava.api.model.VolumesRW;

import javax.annotation.CheckForNull;
import com.github.dockerjava.core.RemoteApiVersion;

/**
*
Expand Down Expand Up @@ -285,7 +284,7 @@ public class ContainerState {

/**
* <a href="https://github.com/docker/docker/pull/18127">Unclear</a>
*
*
* @since {@link RemoteApiVersion#UNKNOWN_VERSION}
*/
@CheckForNull
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javax.annotation.Nonnull;

import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.model.Frame;

/**
Expand Down Expand Up @@ -69,6 +70,13 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>

public LogContainerCmd withSince(Integer since);

/**
* @throws com.github.dockerjava.api.NotFoundException
* No such container
*/
@Override
public <T extends ResultCallback<Frame>> T exec(T resultCallback);

public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;

import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.AuthConfig;
import com.github.dockerjava.api.model.PushResponseItem;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/**
*
* @author marcus
* @author Marcus Linke
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;

import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.WaitResponse;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/AuthConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(Include.NON_NULL)
public class AuthConfig {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -7,8 +7,8 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Device.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.apache.commons.lang.builder.HashCodeBuilder;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(Include.NON_NULL)
public class Device {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/DriverStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Created by ben on 12/12/13.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(Include.NON_NULL)
public class ErrorDetail {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(Include.NON_NULL)
public class ErrorResponse {
Expand Down
4 changes: 2 additions & 2 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
@@ -1,5 +1,7 @@
package com.github.dockerjava.api.model;

import javax.annotation.CheckForNull;

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

import com.fasterxml.jackson.annotation.JsonIgnore;
Expand All @@ -8,8 +10,6 @@
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

import javax.annotation.CheckForNull;

@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(Include.NON_NULL)
public class HostConfig {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/LxcConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(Include.NON_NULL)
public class LxcConf {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* A node as returned by the /events API, for instance, when Swarm is used.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/github/dockerjava/api/model/ResponseItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

import javax.annotation.CheckForNull;

import com.fasterxml.jackson.annotation.JsonIgnore;

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

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* <dd>
* </dl>
*
* @author marcus
* @author Marcus Linke
*
*/
public class RestartPolicy {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Statistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Representation of a Docker statistics.
Expand Down
Loading