Skip to main content
summaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorJonah Graham2018-03-08 16:55:09 -0500
committerJonah Graham2018-03-09 18:28:52 -0500
commitec533341b63e316cef75f4d4ebeeb7ed5b00d2e1 (patch)
treedfc7217f80a4be62a0f12d9838f980caaba8a5f1 /launch
parent84d6fdefaa5aa03e452616e153ad9c3c1338297f (diff)
downloadorg.eclipse.cdt-ec533341b63e316cef75f4d4ebeeb7ed5b00d2e1.tar.gz
org.eclipse.cdt-ec533341b63e316cef75f4d4ebeeb7ed5b00d2e1.tar.xz
org.eclipse.cdt-ec533341b63e316cef75f4d4ebeeb7ed5b00d2e1.zip
[releng] Update CDT in preparation for Photon M6
The most significant change for CDT is the upgrade of com.spotify.docker.client which has knock on effects due to the API changes. Includes: - Updating target platform - removing Neon and Oxygen as potential target platforms in OOMPH setup - Updating CDT standalone debugger - Changes in API for docker changes Change-Id: I68d4f93de3a0e6141c7a37a34f9e8fdb2313fbd8
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
index ad4ccbf6cb..da357e1217 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
@@ -90,7 +90,8 @@ public class ContainerPropertyVolumesModel
selectedDataVolumes.remove(dvm);
}
final List<DataVolumeModel> volumes = new ArrayList<>();
- for (String volume : this.imageInfo.config().volumes()) {
+ for (String volume : this.imageInfo.config().volumes()
+ .keySet()) {
volumes.add(new DataVolumeModel(volume));
}
setDataVolumes(volumes);

Back to the top