Skip to content

Commit 597f25f

Browse files
committed
Remove legacy attach implementation
1 parent 2c74832 commit 597f25f

File tree

2 files changed

+4
-42
lines changed

2 files changed

+4
-42
lines changed

client/src/main/groovy/de/gesellix/docker/client/container/ManageContainerClient.groovy

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ class ManageContainerClient implements ManageContainer {
4343
private final Logger log = LoggerFactory.getLogger(ManageContainerClient)
4444

4545
private EngineApiClient client
46+
/**
47+
* @deprecated for removal
48+
*/
49+
@Deprecated
4650
private EngineClient engineClient
4751
private DockerResponseHandler responseHandler
4852
private QueryParameterEncoder queryParameterEncoder
@@ -58,33 +62,6 @@ class ManageContainerClient implements ManageContainer {
5862
this.archiveUtil = new ArchiveUtil()
5963
}
6064

61-
/**
62-
* @deprecated removed
63-
* @see #attach(java.lang.String, java.lang.String, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, de.gesellix.docker.remote.api.core.StreamCallback, java.time.Duration)
64-
*/
65-
@Deprecated
66-
@Override
67-
EngineResponse attach(String containerId, Map<String, Object> query, AttachConfig callback = null) {
68-
log.info("docker attach")
69-
70-
// When using the TTY setting is enabled in POST /containers/create,
71-
// the stream is the raw data from the process PTY and client’s stdin.
72-
// When the TTY is disabled, then the stream is multiplexed to separate stdout and stderr.
73-
EngineResponseContent<ContainerInspectResponse> container = inspectContainer(containerId)
74-
boolean multiplexStreams = !container.content.config.tty
75-
76-
EngineResponse response = engineClient.post([
77-
path : "/containers/${containerId}/attach".toString(),
78-
query : query,
79-
attach : callback,
80-
multiplexStreams: multiplexStreams])
81-
82-
if (!callback) {
83-
response.stream.multiplexStreams = multiplexStreams
84-
}
85-
return response
86-
}
87-
8865
@Override
8966
void attach(String containerId, String detachKeys, Boolean logs, Boolean stream,
9067
Boolean stdin, Boolean stdout, Boolean stderr,

client/src/main/java/de/gesellix/docker/client/container/ManageContainer.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import de.gesellix.docker.client.EngineResponseContent;
44
import de.gesellix.docker.engine.AttachConfig;
5-
import de.gesellix.docker.engine.EngineResponse;
65
import de.gesellix.docker.remote.api.ContainerCreateRequest;
76
import de.gesellix.docker.remote.api.ContainerCreateResponse;
87
import de.gesellix.docker.remote.api.ContainerInspectResponse;
@@ -30,20 +29,6 @@
3029

3130
public interface ManageContainer {
3231

33-
/**
34-
* @deprecated removed
35-
* @see #attach(java.lang.String, java.lang.String, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, de.gesellix.docker.remote.api.core.StreamCallback, java.time.Duration)
36-
*/
37-
@Deprecated
38-
EngineResponse attach(String container, Map<String, Object> query);
39-
40-
/**
41-
* @deprecated removed
42-
* @see #attach(java.lang.String, java.lang.String, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, de.gesellix.docker.remote.api.core.StreamCallback, java.time.Duration)
43-
*/
44-
@Deprecated
45-
EngineResponse attach(String container, Map<String, Object> query, AttachConfig callback);
46-
4732
void attach(String containerId,
4833
String detachKeys,
4934
Boolean logs, Boolean stream,

0 commit comments

Comments
 (0)