CODENVY-1443: fix incorrect usage of non bind-mount volumes (eclipse-che#3877)

Add other minor fixes
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>

Author: Alexander Garagatyi

plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/json/Volume.java

@@ -30,4 +30,15 @@ public class Volume {
     public String toString() {
         return "{}";
     }
+
+    @Override
+    public int hashCode() {
+        return 19;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        return o instanceof Volume;
+    }
 }

plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/MachineProviderImpl.java

@@ -45,6 +45,7 @@
 import org.eclipse.che.plugin.docker.client.json.ContainerConfig;
 import org.eclipse.che.plugin.docker.client.json.HostConfig;
 import org.eclipse.che.plugin.docker.client.json.PortBinding;
+import org.eclipse.che.plugin.docker.client.json.Volume;
 import org.eclipse.che.plugin.docker.client.json.container.NetworkingConfig;
 import org.eclipse.che.plugin.docker.client.json.network.ConnectContainer;
 import org.eclipse.che.plugin.docker.client.json.network.EndpointConfig;
@@ -496,15 +497,13 @@ private String createContainer(String workspaceId,
                                                                                                     endpointConfig));
 
         HostConfig hostConfig = new HostConfig();
-        hostConfig.withBinds(toArrayIfNotNull(service.getVolumes()))
-                  .withMemorySwap(machineMemorySwap)
+        hostConfig.withMemorySwap(machineMemorySwap)
                   .withMemory(service.getMemLimit())
                   .withNetworkMode(networkName)
                   .withLinks(toArrayIfNotNull(service.getLinks()))
                   .withPortBindings(service.getPorts()
                                            .stream()
-                                           .collect(toMap(Function.identity(),
-                                                          value -> new PortBinding[0])))
+                                           .collect(toMap(Function.identity(), value -> new PortBinding[0])))
                   .withVolumesFrom(toArrayIfNotNull(service.getVolumesFrom()));
 
         ContainerConfig config = new ContainerConfig();
@@ -524,6 +523,19 @@ private String createContainer(String workspaceId,
                               .map(entry -> entry.getKey() + "=" + entry.getValue())
                               .toArray(String[]::new));
 
+        List<String> bindMountVolumes = new ArrayList<>();
+        Map<String, Volume> nonBindMountVolumes = new HashMap<>();
+        for (String volume : service.getVolumes()) {
+            // If volume contains colon then it is bind volume, otherwise - non bind-mount volume.
+            if (volume.contains(":")) {
+                bindMountVolumes.add(volume);
+            } else {
+                nonBindMountVolumes.put(volume, new Volume());
+            }
+        }
+        hostConfig.setBinds(bindMountVolumes.toArray(new String[bindMountVolumes.size()]));
+        config.setVolumes(nonBindMountVolumes);
+
         addStaticDockerConfiguration(config);
 
         return docker.createContainer(CreateContainerParams.create(config)

plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalCheInfrastructureProvisioner.java

@@ -12,14 +12,14 @@
 
 import com.google.common.base.Strings;
 
-import org.eclipse.che.api.core.model.workspace.Environment;
-import org.eclipse.che.api.core.model.workspace.ExtendedMachine;
 import org.eclipse.che.api.core.util.SystemInfo;
 import org.eclipse.che.api.environment.server.AgentConfigApplier;
 import org.eclipse.che.api.environment.server.DefaultInfrastructureProvisioner;
 import org.eclipse.che.api.environment.server.exception.EnvironmentException;
 import org.eclipse.che.api.environment.server.model.CheServiceImpl;
 import org.eclipse.che.api.environment.server.model.CheServicesEnvironmentImpl;
+import org.eclipse.che.api.workspace.server.model.impl.EnvironmentImpl;
+import org.eclipse.che.api.workspace.server.model.impl.ExtendedMachineImpl;
 import org.eclipse.che.commons.annotation.Nullable;
 import org.eclipse.che.commons.lang.os.WindowsPathEscaper;
 import org.eclipse.che.inject.CheBootstrap;
@@ -31,6 +31,8 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import static java.lang.String.format;
@@ -74,14 +76,20 @@ public LocalCheInfrastructureProvisioner(AgentConfigApplier agentConfigApplier,
     }
 
     @Override
-    public void provision(Environment envConfig, CheServicesEnvironmentImpl internalEnv) throws EnvironmentException {
+    public void provision(EnvironmentImpl envConfig, CheServicesEnvironmentImpl internalEnv)
+            throws EnvironmentException {
         String devMachineName = getDevMachineName(envConfig);
         if (devMachineName == null) {
             throw new EnvironmentException("ws-machine is not found on agents applying");
         }
 
         CheServiceImpl devMachine = internalEnv.getServices().get(devMachineName);
-        List<String> devMachineVolumes = devMachine.getVolumes();
+
+        for (CheServiceImpl machine : internalEnv.getServices().values()) {
+            ArrayList<String> volumes = new ArrayList<>(machine.getVolumes());
+            volumes.add(terminalVolumeProvider.get());
+            machine.setVolumes(volumes);
+        }
 
         // add bind-mount volume for projects in a workspace
         String projectFolderVolume;
@@ -93,6 +101,7 @@ public void provision(Environment envConfig, CheServicesEnvironmentImpl internal
             throw new EnvironmentException("Error occurred on resolving path to files of workspace " +
                                            internalEnv.getWorkspaceId());
         }
+        List<String> devMachineVolumes = devMachine.getVolumes();
         devMachineVolumes.add(SystemInfo.isWindows() ? pathEscaper.escapePath(projectFolderVolume)
                                                      : projectFolderVolume);
         // add volume with ws-agent archive
@@ -102,19 +111,17 @@ public void provision(Environment envConfig, CheServicesEnvironmentImpl internal
         if (dockerExtConfVolume != null) {
             devMachineVolumes.add(dockerExtConfVolume);
         }
-        devMachine.getEnvironment().put(CheBootstrap.CHE_LOCAL_CONF_DIR,
-                                        DockerExtConfBindingProvider.EXT_CHE_LOCAL_CONF_DIR);
-
-        for (CheServiceImpl machine : internalEnv.getServices().values()) {
-            machine.getVolumes().add(terminalVolumeProvider.get());
-        }
+        HashMap<String, String> environmentVars = new HashMap<>(devMachine.getEnvironment());
+        environmentVars.put(CheBootstrap.CHE_LOCAL_CONF_DIR, DockerExtConfBindingProvider.EXT_CHE_LOCAL_CONF_DIR);
+        devMachine.setEnvironment(environmentVars);
 
         // apply basic infra (e.g. agents)
         super.provision(envConfig, internalEnv);
     }
 
     @Override
-    public void provision(ExtendedMachine machineConfig, CheServiceImpl internalMachine) throws EnvironmentException {
+    public void provision(ExtendedMachineImpl machineConfig, CheServiceImpl internalMachine)
+            throws EnvironmentException {
         internalMachine.getVolumes().add(terminalVolumeProvider.get());
 
         super.provision(machineConfig, internalMachine);