diff options
author | Jeff Johnston | 2017-05-11 20:08:24 +0000 |
---|---|---|
committer | Jeff Johnston | 2017-06-22 22:10:11 +0000 |
commit | 5dce123041d73636f6caf72a60176394c5d3a879 (patch) | |
tree | e4449d183ebdb5ccab9192d497e7bd7b046ffca7 | |
parent | eb561ddbf82933950d2a68fbc52ff0bff3223264 (diff) | |
download | org.eclipse.cdt-5dce123041d73636f6caf72a60176394c5d3a879.tar.gz org.eclipse.cdt-5dce123041d73636f6caf72a60176394c5d3a879.tar.xz org.eclipse.cdt-5dce123041d73636f6caf72a60176394c5d3a879.zip |
Fix containerBuild branch to work with latest Linux Tools master
- fix ContainerPropertyTab changeEvent() method to match new
format for IDockerManagerListener
- ditto for ContainerTab
- add "seccomp:unconfined" option when launching the gdbserver
for debugging to avoid issue with using ptrace in Container
Change-Id: I2b07b64ba3f9e26b27e5100e357556d99c5272dc
2 files changed, 3 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java index ded93dcd538..c444c80896c 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java @@ -503,7 +503,7 @@ public class ContainerPropertyTab extends AbstractCBuildPropertyTab } @Override - public void changeEvent(int type) { + public void changeEvent(IDockerConnection changedConnection, int type) { String currUri = null; int currIndex = 0; connections = DockerConnectionManager.getInstance().getConnections(); diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java index 1786646846f..f2cb4b8e5aa 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java @@ -517,7 +517,8 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements return SWTImagesFactory.get(SWTImagesFactory.IMG_CONTAINER); } - public void changeEvent(int type) { + @Override + public void changeEvent(IDockerConnection changedConnection, int type) { String currUri = null; int currIndex = 0; connections = DockerConnectionManager.getInstance().getConnections(); |