Skip to content

Fix for #670 #680

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
KostyaSha merged 1 commit into from
Aug 28, 2016
Merged

Fix for #670 #680

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
31 changes: 31 additions & 0 deletions src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ public void onNext(T object) {
}
}

public class SkipResultCallback extends ResultCallbackTemplate<ResponseCallback<Void>, Void> {
@Override
public void onNext(Void object) {
}
}

private ChannelProvider channelProvider;

private String resource;
Expand Down Expand Up @@ -401,6 +407,31 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
channel.pipeline().addLast(new JsonObjectDecoder());
channel.pipeline().addLast(jsonResponseHandler);

postChunkedStreamRequest(requestProvider, channel, body);
}

public void postStream(InputStream body) {
SkipResultCallback resultCallback = new SkipResultCallback();

HttpRequestProvider requestProvider = httpPostRequestProvider(null);

Channel channel = getChannel();

HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);

channel.pipeline().addLast(new ChunkedWriteHandler());
channel.pipeline().addLast(responseHandler);

postChunkedStreamRequest(requestProvider, channel, body);

try {
resultCallback.awaitCompletion();
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}

private void postChunkedStreamRequest(HttpRequestProvider requestProvider, Channel channel, InputStream body) {
HttpRequest request = requestProvider.getHttpRequest(resource);

// don't accept FullHttpRequest here
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.core.type.TypeReference;
import com.github.dockerjava.api.command.LoadImageCmd;
import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.netty.WebTarget;
Expand All @@ -22,8 +21,8 @@ protected Void execute(LoadImageCmd command) {
WebTarget webResource = getBaseResource().path("/images/load");

LOGGER.trace("POST: {}", webResource);
return webResource.request()
.post(new TypeReference<Void>() {
}, command.getImageStream());
webResource.request().postStream(command.getImageStream());

return null;
}
}