Merge pull request #286 from FlowCI/feature/285

api run docker not start docker directly build

Author: yunheli

docker/app-api.properties

@@ -38,6 +38,8 @@ jfiglet.message =  FlowCi Started Success
 ## plugin repos url
 plugins.repository = https://raw.githubusercontent.com/flowci/plugins/master/repository.json
 
+api.run.indocker = true
+
 task.job.toggle.execution_timeout = true
 ## 6s expire job
 task.job.toggle.execution_create_session_duration = 1800

platform-api/src/main/resources/app-default.properties

@@ -25,6 +25,8 @@ api.user.expire = 604800
 ## plugin setting
 plugins.repository = https://raw.githubusercontent.com/flowci/plugins/master/repository.json
 
+api.run.indocker = false
+
 ### domain ###
 domain.api = http://localhost:8088
 domain.web = http://localhost:3000

platform-api/src/test/resources/app-test.properties

@@ -24,6 +24,7 @@ api.user.expire = 60000
 
 ## plugin setting
 plugins.repository = https://raw.githubusercontent.com/yunheli/plugins/master/repository.json
+api.run.indocker = false
 
 ### domain ###
 domain.api = http://localhost:8080

platform-plugin/src/main/java/com/flow/platform/plugin/service/PluginServiceImpl.java

@@ -30,8 +30,10 @@
 import com.flow.platform.plugin.event.PluginRefreshEvent.Status;
 import com.flow.platform.plugin.event.PluginStatusChangeEvent;
 import com.flow.platform.plugin.exception.PluginException;
+import com.flow.platform.plugin.util.CmdUtil;
 import com.flow.platform.plugin.util.YmlUtil;
 import com.flow.platform.plugin.util.docker.Docker;
+import com.flow.platform.util.CommandUtil.Unix;
 import com.flow.platform.util.ExceptionUtil;
 import com.flow.platform.util.Logger;
 import com.flow.platform.util.git.GitException;
@@ -55,6 +57,7 @@
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -83,6 +86,9 @@ public class PluginServiceImpl extends ApplicationEventService implements Plugin
 
     private final static String TMP = "tmp";
 
+    @Value("${api.run.indocker}")
+    private boolean runInDocker;
+
     // git clone folder
     @Autowired
     private Path gitWorkspace;
@@ -447,7 +453,8 @@ public void exec(Plugin plugin) {
             try {
 
                 // only build and image all in value to pull image
-                if (!Strings.isBlank(plugin.getPluginDetail().getBuild()) && !Strings.isBlank(plugin.getPluginDetail().getImage())) {
+                if (!Strings.isBlank(plugin.getPluginDetail().getBuild()) && !Strings
+                    .isBlank(plugin.getPluginDetail().getImage())) {
 
                     LOGGER.traceMarker("BuildProcessor", "Start build code");
 
@@ -457,7 +464,12 @@ public void exec(Plugin plugin) {
                     JGitUtil.checkout(cachePath, latestGitTag);
 
                     // first pull image and build
-                    dockerPullAndBuild(plugin);
+                    if (!runInDocker) {
+                        dockerPullAndBuild(plugin);
+                    } else {
+                        // if run in docker only build
+                        build(plugin);
+                    }
 
                     // second detect outputs
                     detectBuildArtifacts(plugin);
@@ -475,6 +487,12 @@ public void exec(Plugin plugin) {
             }
         }
 
+        private void build(Plugin plugin) {
+            Path cachePath = gitCachePath(plugin);
+            String cmd = "cd " + cachePath.toString() + Unix.LINE_SEPARATOR + plugin.getPluginDetail().getBuild();
+            CmdUtil.exeCmd(cmd);
+        }
+
         private void dockerPullAndBuild(Plugin plugin) {
             Path cachePath = gitCachePath(plugin);
             Docker docker = new Docker();
@@ -565,7 +583,8 @@ private class PushProcessor implements Processor {
         public void exec(Plugin plugin) {
             LOGGER.traceMarker("PushProcessor", "Push tags to local");
 
-            if (!Strings.isBlank(plugin.getPluginDetail().getImage()) && !Strings.isBlank(plugin.getPluginDetail().getBuild())) {
+            if (!Strings.isBlank(plugin.getPluginDetail().getImage()) && !Strings
+                .isBlank(plugin.getPluginDetail().getBuild())) {
                 return;
             }
 

platform-plugin/src/main/java/com/flow/platform/plugin/util/CmdUtil.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flow.platform.plugin.util;
+
+import com.flow.platform.plugin.exception.PluginException;
+import com.flow.platform.util.CommandUtil.Unix;
+import com.flow.platform.util.Logger;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+/**
+ * @author yh@firim
+ */
+public class CmdUtil {
+
+    private final static Logger LOGGER = new Logger(CmdUtil.class);
+
+    public static void exeCmd(String shell) {
+        BufferedReader br;
+        try {
+            Process process;
+            ProcessBuilder pb = new ProcessBuilder(Unix.CMD_EXECUTOR, "-c", shell);
+            pb.environment();
+
+            // Merge error stream to standard stream
+            pb.redirectErrorStream(true);
+
+            // start
+            process = pb.start();
+            if (process != null) {
+                br = new BufferedReader(
+                    new InputStreamReader(process.getInputStream()), 1024);
+
+                // wait process finish
+                process.waitFor();
+            } else {
+                throw new PluginException("Plugin running process is not start");
+            }
+
+            String line;
+            while (br != null && (line = br.readLine()) != null) {
+                // show running log
+                LOGGER.debug(line);
+            }
+        } catch (Exception e) {
+            LOGGER.error("Exec cmd error", e);
+        } finally {
+        }
+    }
+}

platform-plugin/src/test/java/com/flow/platform/plugin/test/util/ShellUtilTest.java

@@ -0,0 +1,23 @@
+package com.flow.platform.plugin.test.util;
+
+import com.flow.platform.plugin.test.TestBase;
+import com.flow.platform.plugin.util.CmdUtil;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * @author yh@firim
+ */
+public class ShellUtilTest extends TestBase{
+
+    @Value("${api.run.indocker}")
+    private boolean runInDocker;
+
+
+    @Test
+    public void should_exec_cmd_success() {
+        CmdUtil.exeCmd("echo helloworld");
+        CmdUtil.exeCmd("pwd");
+        CmdUtil.exeCmd("mvn");
+    }
+}

platform-plugin/src/test/resources/plugin.properties

@@ -1,3 +1,4 @@
 api.git.cache = /tmp/flow-ci-ut/git-cache
 api.git.workspace = /tmp/flow-ci-ut/git-clone
-plugins.repository = http://localhost:8080/repos/plugin.json
+plugins.repository = http://localhost:8080/repos/plugin.json
+api.run.indocker = false