Bug 499954 - Container with TTY doesn't display log or remove logs
- for terminals, always wait for container to be running or else
finished
Change-Id: I26a46657bf635e318b1fa0a35275dd0b78ccfd8b
Reviewed-on: https://git.eclipse.org/r/79670
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/RunConsole.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/RunConsole.java
index 2fa980f..4a24048 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/RunConsole.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/RunConsole.java
@@ -168,17 +168,15 @@
Thread t = new Thread(() -> {
try {
DockerConnection conn = (DockerConnection) connection;
- if (conn.getContainerInfo(containerId).config().openStdin()) {
- IDockerContainerState state = conn
- .getContainerInfo(containerId).state();
- do {
- if (!state.running() && state.finishDate() == null) {
- Thread.sleep(300);
- }
- state = conn.getContainerInfo(containerId).state();
- } while (!state.running() && state.finishDate() == null);
- conn.attachCommand(containerId, null, null);
- }
+ IDockerContainerState state = conn.getContainerInfo(containerId)
+ .state();
+ do {
+ if (!state.running() && state.finishDate() == null) {
+ Thread.sleep(300);
+ }
+ state = conn.getContainerInfo(containerId).state();
+ } while (!state.running() && state.finishDate() == null);
+ conn.attachCommand(containerId, null, null);
} catch (Exception e) {
}
});
