feat: 前端镜像部署handler, 待测试

api/src/main/java/seecoder/devcloud/api/docker/impl/DockerApiImpl.java

@@ -93,8 +93,7 @@ public class DockerApiImpl implements DockerApi {
     private static class LogActionProgressHandler implements ProgressHandler {
         @Override
         public void progress(ProgressMessage message) {
-//            if (message.error() != null)
-//                log.error(message.error());
+            System.out.println(message);
         }
     }
 }

core/src/main/java/seecoder/devcloud/core/pipeline/handler/JavaImageBuildHandler.java

@@ -120,24 +120,19 @@ public class JavaImageBuildHandler extends AbstractHandler {
         StringBuilder sb = new StringBuilder();
         try {
             dockerApi.buildAndPush(directory.toString(), "seecoder-devcloud-" + imageName, imageTag, new ProgressHandler() {
-                @Override
-                public void progress(ProgressMessage message) throws DockerException {
-                    String value = message.stream();
-                    if (value == null) {
-                        value = "";
-                    }
-                    if (!StringUtils.isEmpty(message.error())) {
-                        value += "\n" + message.error();
-                        sb.append(value);
-                        System.out.println(sb.toString());
+                    @Override
+                    public void progress(ProgressMessage message) throws DockerException {
+                        if (!StringUtils.isEmpty(message.error())) {
+                            sb.append(message.error()+"\n");
+                        }
+
                     }
-                    context.setResult(context.getResult() + sb.toString());
-                }
-            });
-        } catch (Exception e) {
-            context.appendErrorResult(PipelineException.IMAGE_BUILD_ERROR,e);
-            throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE, PipelineException.IMAGE_BUILD_ERROR ,e);
-        }
+                });
+            } catch (Exception e) {
+                context.appendErrorResult(PipelineException.IMAGE_BUILD_ERROR,e);
+                context.setResult(context.getResult() + "IMAGE BUILD DETAILS:" + sb.toString());
+                throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE, PipelineException.IMAGE_BUILD_ERROR ,e);
+            }
         //6. 将镜像名字加入context
         context.getConfigs().put("imageName", imageName);
         context.getConfigs().put("imageTag", imageTag);

core/src/main/java/seecoder/devcloud/core/pipeline/handler/NodeImageBuildHandler.java

@@ -23,6 +23,7 @@ import java.util.Date;
  * @author PuHong Weng
  * @date 2021/3/24
  * @description:
+ * 前端镜像构建
  */
 public class NodeImageBuildHandler extends AbstractHandler{
     public final DockerApi dockerApi;
@@ -68,20 +69,15 @@ public class NodeImageBuildHandler extends AbstractHandler{
             dockerApi.buildAndPush(directory.toString(), "seecoder-devcloud-" + imageName, imageTag, new ProgressHandler() {
                 @Override
                 public void progress(ProgressMessage message) throws DockerException {
-                    String value = message.stream();
-                    if (value == null) {
-                        value = "";
-                    }
                     if (!StringUtils.isEmpty(message.error())) {
-                        value += "\n" + message.error();
-                        sb.append(value);
-                        System.out.println(sb.toString());
+                        sb.append(message.error()+"\n");
                     }
-                    context.setResult(context.getResult() + sb.toString());
+
                 }
             });
         } catch (Exception e) {
             context.appendErrorResult(PipelineException.IMAGE_BUILD_ERROR,e);
+            context.setResult(context.getResult() + "IMAGE BUILD DETAILS:" + sb.toString());
             throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE, PipelineException.IMAGE_BUILD_ERROR ,e);
         }
         //6. 将镜像名字加入context