diff options
author | Jeff Johnston | 2018-06-04 22:54:22 +0000 |
---|---|---|
committer | Jeff Johnston | 2018-06-06 13:55:25 +0000 |
commit | 76798f9d71df43e6605765782ad4a97dcb333e59 (patch) | |
tree | e6099b13f2b2c27e9a705091b82e074e2c516ae0 /containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal | |
parent | 8bf091702f454c70a3aa7cfb947b83ca6cc9f11c (diff) | |
download | org.eclipse.linuxtools-76798f9d71df43e6605765782ad4a97dcb333e59.tar.gz org.eclipse.linuxtools-76798f9d71df43e6605765782ad4a97dcb333e59.tar.xz org.eclipse.linuxtools-76798f9d71df43e6605765782ad4a97dcb333e59.zip |
Bug 535524 - Latest Docker Tooling creates extraneous Terminals
- add new parameter to DockerConnection attachCommand with token
so that it can specify if a terminal needs to be opened
- in ContainerCommandProcess, set the terminal boolean to false
when calling attachCommand for a tty application
Change-Id: Icdfcc88e033209e065f7bfb59be7f807ae26f740
Reviewed-on: https://git.eclipse.org/r/123952
Tested-by: CI Bot
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
Diffstat (limited to 'containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal')
-rw-r--r-- | containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java index 56b608e030..4461e9d607 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java @@ -125,7 +125,8 @@ public class ContainerCommandProcess extends Process { Thread.sleep(50); state = connection.getContainerInfo(containerId).state(); if (state.running()) { - ((DockerConnection) connection).attachCommand(inputToken, containerId, pipedStdinIn, null); + ((DockerConnection) connection).attachCommand(inputToken, containerId, pipedStdinIn, null, + false); ((DockerConnection) connection).attachContainerOutput(token, containerId, pipedStdout, pipedStderr); } @@ -251,10 +252,6 @@ public class ContainerCommandProcess extends Process { if (!threadDone) { // we are stuck try { - Activator.logWarningMessage( - LaunchMessages.getFormattedString( - "ContainerLoggingNotResponding.msg", //$NON-NLS-1$ - containerId.substring(0, 8))); this.stdout.close(); this.stderr.close(); this.stdin.close(); |