From ec533341b63e316cef75f4d4ebeeb7ed5b00d2e1 Mon Sep 17 00:00:00 2001
From: Jonah Graham
Date: Thu, 8 Mar 2018 21:55:09 +0000
Subject: [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
---
 .../cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'launch')

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 ad4ccbf6cba..da357e1217f 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);
-- 
cgit v1.2.3