Merge branch 'master' into CHE-1207

eclipse-che · May 30, 2016 · f2d0226 · f2d0226
2 parents 2f3a2bc + ae4c552
commit f2d0226
Show file tree

Hide file tree

Showing 45 changed files with 1,314 additions and 508 deletions.
diff --git a/...he-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java b/...he-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java
@@ -24,4 +24,10 @@ public interface MachineSource {
      * Returns URL or ID
      */
     String getLocation();
+
+    /**
+     * @return content of the machine source. No need to use an external link.
+     */
+    String getContent();
+
 }
diff --git a/...in-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/DockerInstance.java b/...in-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/DockerInstance.java
@@ -16,12 +16,12 @@
 import org.eclipse.che.api.core.NotFoundException;
 import org.eclipse.che.api.core.model.machine.Command;
 import org.eclipse.che.api.core.model.machine.Machine;
+import org.eclipse.che.api.core.model.machine.MachineSource;
 import org.eclipse.che.api.core.util.LineConsumer;
 import org.eclipse.che.api.core.util.ListLineConsumer;
 import org.eclipse.che.api.machine.server.exception.MachineException;
 import org.eclipse.che.api.machine.server.model.impl.MachineRuntimeInfoImpl;
 import org.eclipse.che.api.machine.server.spi.Instance;
-import org.eclipse.che.api.machine.server.spi.InstanceKey;
 import org.eclipse.che.api.machine.server.spi.InstanceProcess;
 import org.eclipse.che.api.machine.server.spi.impl.AbstractInstance;
 import org.eclipse.che.commons.lang.NameGenerator;
@@ -60,6 +60,11 @@
 public class DockerInstance extends AbstractInstance {
     private static final Logger LOG = LoggerFactory.getLogger(DockerInstance.class);
 
+    /**
+     * Name of the latest tag used in Docker image.
+     */
+    public static final String LATEST_TAG = "latest";
+
     private static final AtomicInteger pidSequence           = new AtomicInteger(1);
     private static final String        PID_FILE_TEMPLATE     = "/tmp/docker-exec-%s.pid";
     private static final Pattern       PID_FILE_PATH_PATTERN = Pattern.compile(String.format(PID_FILE_TEMPLATE, "([0-9]+)"));
@@ -191,21 +196,20 @@ public InstanceProcess createProcess(Command command, String outputChannel) thro
     }
 
     @Override
-    public InstanceKey saveToSnapshot(String owner) throws MachineException {
+    public MachineSource saveToSnapshot(String owner) throws MachineException {
         try {
             final String repository = generateRepository();
-            final String tag = "latest";
             if(!snapshotUseRegistry) {
-                commitContainer(owner, repository, tag);
-                return new DockerInstanceKey(repository, tag);
+                commitContainer(owner, repository, LATEST_TAG);
+                return new DockerMachineSource(repository).withTag(LATEST_TAG);
             }
             final String repositoryName = registry + '/' + repository;
-            commitContainer(owner, repositoryName, tag);
+            commitContainer(owner, repositoryName, LATEST_TAG);
             //TODO fix this workaround. Docker image is not visible after commit when using swarm
             Thread.sleep(2000);
             final ProgressLineFormatterImpl lineFormatter = new ProgressLineFormatterImpl();
             final String digest = docker.push(PushParams.create(repository)
-                                                        .withTag(tag)
+                                                        .withTag(LATEST_TAG)
                                                         .withRegistry(registry),
                                               progressMonitor -> {
                                                   try {
@@ -214,7 +218,7 @@ public InstanceKey saveToSnapshot(String owner) throws MachineException {
                                                   }
                                               });
             docker.removeImage(RemoveImageParams.create(repositoryName).withForce(false));
-            return new DockerInstanceKey(repository, tag, registry, digest);
+            return new DockerMachineSource(repository).withRegistry(registry).withDigest(digest).withTag(LATEST_TAG);
         } catch (IOException ioEx) {
             throw new MachineException(ioEx);
         } catch (InterruptedException e) {

diff --git a/...docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/DockerInstanceKey.java b/...docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/DockerInstanceKey.java