Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2016-12-07 17:36:20 +0000
committerJeff Johnston2016-12-07 18:29:01 +0000
commitf507daa49138b674635d0469355355e1122177ed (patch)
treef4d1dd3e8d219319b70b25521f6b57f61189aeb0
parent207661e4afc3edc57d5a32df20a82b50c9e62a3e (diff)
downloadorg.eclipse.linuxtools-f507daa49138b674635d0469355355e1122177ed.tar.gz
org.eclipse.linuxtools-f507daa49138b674635d0469355355e1122177ed.tar.xz
org.eclipse.linuxtools-f507daa49138b674635d0469355355e1122177ed.zip
Fix Copy To Container to properly get container info
Change-Id: Iac77c854aae4c4ebe43580bee4f1f28fc8aaa6dd Reviewed-on: https://git.eclipse.org/r/86645 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit 83565ae96b4e18b6d9c75b961df81460ff1392f6) Reviewed-on: https://git.eclipse.org/r/86650
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCopyTo.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCopyTo.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCopyTo.java
index d6b54ee18f..2a4477de2d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCopyTo.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCopyTo.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.wizard.Wizard;
import org.eclipse.linuxtools.docker.core.EnumDockerStatus;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerContainer;
+import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
import org.eclipse.linuxtools.docker.ui.Activator;
import org.eclipse.linuxtools.internal.docker.core.ContainerFileProxy;
import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
@@ -69,7 +70,11 @@ public class ContainerCopyTo extends Wizard {
// it is running and it has specified to use a tty
boolean usingTTY = false;
if (isRunning) {
- usingTTY = container.info().config().tty();
+ IDockerContainerInfo info = connection
+ .getContainerInfo(container.id());
+ if (info != null) {
+ usingTTY = info.config().tty();
+ }
}
mainPage = new ContainerCopyToPage(sfo.getResult(), provider,

Back to the top