apply an new common docker manager

Author: gy2006

core/pom.xml

@@ -19,6 +19,11 @@
       <artifactId>domain</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.flowci</groupId>
+      <artifactId>docker</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.flowci</groupId>
       <artifactId>sm</artifactId>
@@ -104,11 +109,6 @@
       <artifactId>org.eclipse.jgit</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>

core/src/main/java/com/flowci/core/job/config/JobConfig.java

@@ -19,6 +19,8 @@
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
 import com.flowci.core.job.domain.Step;
+import com.flowci.docker.DockerManager;
+import com.flowci.docker.DockerSDKManager;
 import com.flowci.tree.NodeTree;
 import com.flowci.util.FileHelper;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -58,4 +60,9 @@ public Path pluginDir() throws IOException {
         Path pluginDir = Paths.get(workspace, "repos");
         return FileHelper.createDirectory(pluginDir);
     }
+
+    @Bean
+    public DockerManager dockerManager() {
+        return new DockerSDKManager(DockerManager.DockerLocalHost);
+    }
 }

core/src/main/java/com/flowci/core/job/manager/DockerManager.java

@@ -1,20 +1,23 @@
 package com.flowci.core.job.service;
 
+import com.flowci.core.api.adviser.ApiAuth;
+import com.flowci.core.common.domain.Variables;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.job.dao.ExecutedLocalTaskDao;
 import com.flowci.core.job.domain.Executed;
 import com.flowci.core.job.domain.ExecutedLocalTask;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.TaskUpdateEvent;
-import com.flowci.core.job.manager.DockerManager;
 import com.flowci.core.job.manager.YmlManager;
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.event.GetPluginAndVerifySetContext;
 import com.flowci.core.plugin.event.GetPluginEvent;
+import com.flowci.docker.ContainerManager;
+import com.flowci.docker.DockerManager;
+import com.flowci.docker.ImageManager;
+import com.flowci.docker.domain.DockerStartOption;
 import com.flowci.domain.LocalTask;
-import com.flowci.domain.StringVars;
-import com.flowci.exception.NotAvailableException;
 import com.flowci.exception.StatusException;
 import com.flowci.tree.NodeTree;
 import com.flowci.util.ObjectsHelper;
@@ -34,7 +37,10 @@ public class LocalTaskServiceImpl implements LocalTaskService {
 
     private static final String DefaultImage = "flowci/plugin-runtime";
 
-    private static final int DefaultTimeout = 60; // seconds
+    private static final int DefaultTimeout = 120; // seconds
+
+    @Autowired
+    private String serverUrl;
 
     @Autowired
     private ExecutedLocalTaskDao executedLocalTaskDao;
@@ -109,13 +115,21 @@ public ExecutedLocalTask execute(Job job, LocalTask task) {
         ExecutedLocalTask exec = optional.get();
         updateStatusTimeAndSave(exec, Executed.Status.RUNNING, null);
 
-        DockerManager.Option option = new DockerManager.Option();
+        DockerStartOption option = new DockerStartOption();
         option.setImage(DefaultImage);
-        option.setInputs(new StringVars(job.getContext()).merge(task.getEnvs()));
+        option.addEntryPoint("/bin/bash");
+        option.addEntryPoint("-c");
+        option.getEnv()
+                .putAndReturn(Variables.App.Url, serverUrl)
+                .putAndReturn(Variables.Agent.Token, ApiAuth.LocalTaskToken)
+                .putAndReturn(Variables.Agent.Workspace, "/ws/")
+                .putAndReturn(Variables.Agent.PluginDir, "/ws/.plugins")
+                .merge(job.getContext())
+                .merge(task.getEnvs());
 
         if (task.hasPlugin()) {
             String name = task.getPlugin();
-            GetPluginEvent event = eventManager.publish(new GetPluginAndVerifySetContext(this, name, option.getInputs()));
+            GetPluginEvent event = eventManager.publish(new GetPluginAndVerifySetContext(this, name, option.getEnv()));
 
             if (event.hasError()) {
                 String message = event.getError().getMessage();
@@ -125,15 +139,9 @@ public ExecutedLocalTask execute(Job job, LocalTask task) {
             }
 
             Plugin plugin = event.getFetched();
-
-            option.setScript(plugin.getScript());
-            option.setPlugin(plugin.getName());
-            option.setPluginDir(event.getDir().toString());
-
-            // apply docker image only from plugin if it's specified
-            ObjectsHelper.ifNotNull(plugin.getDocker(), (docker) -> {
-                option.setImage(plugin.getDocker().getImage());
-            });
+            option.addEntryPoint(plugin.getScript());
+            option.addBind(event.getDir().toString(), "/ws/.plugins/" + plugin.getName());
+            ObjectsHelper.ifNotNull(plugin.getDocker(), (docker) -> option.setImage(docker.getImage()));
         }
 
         try {
@@ -170,26 +178,28 @@ private void updateStatusTimeAndSave(ExecutedLocalTask t, Executed.Status status
         eventManager.publish(new TaskUpdateEvent(this, t.getJobId(), list, false));
     }
 
-    private void runDockerTask(DockerManager.Option option, ExecutedLocalTask r) throws Exception {
+    private void runDockerTask(DockerStartOption option, ExecutedLocalTask r) throws Exception {
+        ContainerManager cm = dockerManager.getContainerManager();
+        ImageManager im = dockerManager.getImageManager();
+        String image = option.getImage();
+
         try {
-            String image = option.getImage();
-            boolean isSuccess = dockerManager.pullImage(image);
-            if (!isSuccess) {
-                throw new NotAvailableException("Docker image {0} not available", image);
-            }
+            im.pull(image, DefaultTimeout, (item) -> {
+                log.info(item.getStatus());
+            });
 
-            String cid = dockerManager.createAndStartContainer(option);
+            String cid = cm.start(option);
             r.setContainerId(cid);
-            dockerManager.printContainerLog(cid);
 
-            if (!dockerManager.waitContainer(cid, DefaultTimeout)) {
-                dockerManager.killContainer(cid);
-            }
+            cm.wait(cid, DefaultTimeout, (frame -> {
+                log.info(new String(frame.getPayload()));
+            }));
 
-            r.setCode(dockerManager.getContainerExitCode(cid));
+            Long exitCode = cm.inspect(cid).getState().getExitCodeLong();
+            r.setCode(exitCode.intValue());
         } finally {
             if (r.hasContainerId()) {
-                dockerManager.removeContainer(r.getContainerId());
+                cm.delete(r.getContainerId());
             }
         }
     }