将 common 模块中的 build 包移到 manager 模块中

common/pom.xml

@@ -43,27 +43,6 @@
             <version>6.4.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.jgit</groupId>
-            <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.4.0.202211300538-r</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jgit</groupId>
-            <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-            <version>6.4.0.202211300538-r</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>3.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-invoker</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>

deployer/pom.xml

@@ -20,11 +20,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.reghao.jutil</groupId>
-            <artifactId>jdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.github.mwiede</groupId>
             <artifactId>jsch</artifactId>

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/AppConfigPageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.controller.page.config;
 
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.manager.app.db.repository.config.build.CompilerConfigRepository;
 import cn.reghao.devops.manager.app.db.repository.config.build.PackerConfigRepository;

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/CompilerPageController.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.manager.app.controller.page.config;
 
 import cn.reghao.devops.common.machine.Machine;
 import cn.reghao.devops.manager.app.db.repository.config.build.CompilerConfigRepository;
-import cn.reghao.devops.common.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
 import cn.reghao.devops.manager.app.model.po.config.build.CompilerConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
 import cn.reghao.devops.manager.util.db.PageSort;

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/RepoAuthPageController.java

@@ -1,8 +1,8 @@
 package cn.reghao.devops.manager.app.controller.page.config;
 
 import cn.reghao.devops.manager.app.db.repository.config.build.RepoAuthConfigRepository;
-import cn.reghao.devops.common.build.model.constant.RepoAuthType;
-import cn.reghao.devops.common.build.model.constant.RepoType;
+import cn.reghao.devops.manager.build.model.constant.RepoAuthType;
+import cn.reghao.devops.manager.build.model.constant.RepoType;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
 import cn.reghao.devops.manager.util.db.PageSort;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/AppConfig.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.model.po.config;
 
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.BuildConfigDto;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.BuildConfigDto;
 import cn.reghao.devops.manager.app.model.constant.AppType;
 import cn.reghao.devops.manager.app.model.dto.AppConfigDto;
 import cn.reghao.devops.manager.app.model.dto.AppConfigUpdateDto;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/CompilerConfig.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.model.po.config.build;
 
-import cn.reghao.devops.common.build.model.CompilerDto;
-import cn.reghao.devops.common.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.model.CompilerDto;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
 import cn.reghao.devops.manager.util.validator.provider.CompilerConfigGroupSequenceProvider;
 import cn.reghao.devops.manager.util.validator.ValidEnum;
 import cn.reghao.devops.manager.util.db.BaseEntity;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/PackerConfig.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.model.po.config.build;
 
-import cn.reghao.devops.common.build.model.PackerDto;
+import cn.reghao.devops.manager.build.model.PackerDto;
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.manager.util.validator.provider.PackerConfigGroupSequenceProvider;
 import cn.reghao.devops.manager.util.validator.ValidEnum;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/RepoAuthConfig.java

@@ -1,9 +1,9 @@
 package cn.reghao.devops.manager.app.model.po.config.build;
 
-import cn.reghao.devops.common.build.model.RepoAuth;
+import cn.reghao.devops.manager.build.model.RepoAuth;
 import cn.reghao.devops.manager.util.validator.provider.RepoAuthGroupSequenceProvider;
-import cn.reghao.devops.common.build.model.constant.RepoAuthType;
-import cn.reghao.devops.common.build.model.constant.RepoType;
+import cn.reghao.devops.manager.build.model.constant.RepoAuthType;
+import cn.reghao.devops.manager.build.model.constant.RepoType;
 import cn.reghao.devops.manager.util.validator.ValidEnum;
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import lombok.Getter;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/log/BuildConsumed.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.model.po.log;
 
-import cn.reghao.devops.common.build.model.BuildConsumedDto;
+import cn.reghao.devops.manager.build.model.BuildConsumedDto;
 import lombok.*;
 
 import javax.persistence.Embeddable;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/log/BuildLog.java

@@ -1,8 +1,8 @@
 package cn.reghao.devops.manager.app.model.po.log;
 
-import cn.reghao.devops.common.build.model.BuildConsumedDto;
-import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
-import cn.reghao.devops.common.build.tool.repo.CommitInfo;
+import cn.reghao.devops.manager.build.model.BuildConsumedDto;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainResult;
+import cn.reghao.devops.manager.build.tool.repo.CommitInfo;
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;

manager/src/main/java/cn/reghao/devops/manager/app/model/vo/CommitInfoVO.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.model.vo;
 
-import cn.reghao.devops.common.build.tool.repo.ChangedFile;
-import cn.reghao.devops.common.build.tool.repo.CommitInfo;
+import cn.reghao.devops.manager.build.tool.repo.ChangedFile;
+import cn.reghao.devops.manager.build.tool.repo.CommitInfo;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

manager/src/main/java/cn/reghao/devops/manager/app/service/PermissionCheck.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.service;
 
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.manager.account.model.constant.RoleType;
 import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.devops.manager.account.service.UserContext;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/BuildStat.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.manager.app.service.bd;
 import cn.reghao.devops.manager.app.model.po.AppBuilding;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.vo.AppBuildingVO;
-import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainResult;
 import cn.reghao.jutil.jdk.db.PageList;
 
 /**

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/AppStatImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.service.bd.impl;
 
 import cn.reghao.devops.common.agent.app.dto.AppInfo;
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.common.msg.constant.AppStatOps;
 import cn.reghao.devops.common.msg.event.EvtAppStat;
 import cn.reghao.devops.manager.account.model.po.User;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/BuildAppImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.service.bd.impl;
 
-import cn.reghao.devops.common.build.chain.BuildHandlers;
-import cn.reghao.devops.common.build.model.AppDto;
+import cn.reghao.devops.manager.build.chain.BuildHandlers;
+import cn.reghao.devops.manager.build.model.AppDto;
 import cn.reghao.devops.manager.app.model.po.AppBuilding;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.service.PermissionCheck;
@@ -9,11 +9,11 @@ import cn.reghao.devops.manager.app.service.bd.BuildDeployNotify;
 import cn.reghao.devops.manager.app.service.bd.DeployApp;
 import cn.reghao.devops.manager.app.service.bd.BuildStat;
 import cn.reghao.devops.manager.app.service.bd.BuildApp;
-import cn.reghao.devops.common.build.chain.impl.BuildChainParam;
-import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
-import cn.reghao.devops.common.build.chain.BuildTools;
-import cn.reghao.devops.common.build.chain.Bootstrap;
-import cn.reghao.devops.common.build.chain.Handler;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainParam;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainResult;
+import cn.reghao.devops.manager.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.Bootstrap;
+import cn.reghao.devops.manager.build.chain.Handler;
 import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/BuildStatImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.service.bd.impl;
 
-import cn.reghao.devops.common.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.AppDto;
 import cn.reghao.devops.manager.app.db.repository.AppBuildingRepository;
 import cn.reghao.devops.manager.app.db.repository.config.AppConfigRepository;
 import cn.reghao.devops.manager.app.db.repository.log.BuildLogRepository;
@@ -11,7 +11,7 @@ import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.app.service.bd.DeployStat;
 import cn.reghao.devops.manager.app.model.vo.AppBuildingVO;
 import cn.reghao.devops.manager.app.service.bd.BuildStat;
-import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainResult;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.ResultStatus;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/GetAppImpl.java

@@ -4,7 +4,7 @@ import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.manager.app.db.repository.config.AppConfigRepository;
 import cn.reghao.devops.manager.app.db.repository.log.BuildLogRepository;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
 import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.app.service.bd.GetApp;
 import cn.reghao.jutil.web.ServletUtil;

manager/src/main/java/cn/reghao/devops/manager/app/service/config/impl/AppConfigServiceImpl.java

@@ -1,17 +1,17 @@
 package cn.reghao.devops.manager.app.service.config.impl;
 
 import cn.reghao.devops.manager.app.db.repository.config.AppConfigRepository;
-import cn.reghao.devops.common.build.model.constant.RepoType;
+import cn.reghao.devops.manager.build.model.constant.RepoType;
 import cn.reghao.devops.manager.app.model.dto.AppConfigDto;
 import cn.reghao.devops.manager.app.model.dto.AppConfigUpdateDto;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.dto.CopyAppDto;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
 import cn.reghao.devops.manager.app.model.vo.BuildConfig;
 import cn.reghao.devops.manager.app.service.bd.BuildLogService;
 import cn.reghao.devops.manager.app.service.bd.BuildStat;
 import cn.reghao.devops.manager.app.service.config.AppConfigService;
-import cn.reghao.devops.common.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.BuildTools;
 import cn.reghao.devops.manager.app.service.config.AppDeployConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;

manager/src/main/java/cn/reghao/devops/manager/app/service/config/impl/BuildDirServiceImpl.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.manager.app.service.config.impl;
 import cn.reghao.devops.common.machine.Disk;
 import cn.reghao.devops.common.machine.Machine;
 import cn.reghao.devops.manager.app.model.po.config.build.BuildDir;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
 import cn.reghao.devops.manager.app.service.config.BuildDirService;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;

manager/src/main/java/cn/reghao/devops/manager/app/service/config/impl/CompilerConfigServiceImpl.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.manager.app.db.repository.config.build.CompilerConfigRep
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.po.config.build.CompilerConfig;
 import cn.reghao.devops.manager.app.service.config.CompilerConfigService;
-import cn.reghao.devops.common.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.BuildTools;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

manager/src/main/java/cn/reghao/devops/manager/app/service/config/impl/PackerConfigServiceImpl.java

@@ -6,7 +6,7 @@ import cn.reghao.devops.manager.app.db.repository.config.build.PackerConfigRepos
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.po.config.build.PackerConfig;
 import cn.reghao.devops.manager.app.service.config.PackerConfigService;
-import cn.reghao.devops.common.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.BuildTools;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

manager/src/main/java/cn/reghao/devops/manager/app/service/config/impl/RepoAuthConfigServiceImpl.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.manager.app.db.repository.config.build.RepoAuthConfigRep
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.devops.manager.app.service.config.RepoAuthConfigService;
-import cn.reghao.devops.common.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.BuildTools;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

common/src/main/java/cn/reghao/devops/common/build/chain/Bootstrap.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/Bootstrap.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
-import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
+import cn.reghao.devops.manager.build.chain.impl.BuildChainResult;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;

common/src/main/java/cn/reghao/devops/common/build/chain/BuildHandlers.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/BuildHandlers.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
-import cn.reghao.devops.common.build.chain.impl.*;
+import cn.reghao.devops.manager.build.chain.impl.*;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/cn/reghao/devops/common/build/chain/BuildTools.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/BuildTools.java

@@ -1,22 +1,23 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.CompilerDto;
-import cn.reghao.devops.common.build.model.PackerDto;
-import cn.reghao.devops.common.build.model.RepoAuth;
-import cn.reghao.devops.common.build.model.constant.CompileType;
-import cn.reghao.devops.common.build.model.constant.RepoType;
-import cn.reghao.devops.common.build.tool.compiler.CodeCompiler;
-import cn.reghao.devops.common.build.tool.compiler.EmptyCompiler;
-import cn.reghao.devops.common.build.tool.compiler.MavenCompiler;
-import cn.reghao.devops.common.build.tool.compiler.ShellCompiler;
-import cn.reghao.devops.common.build.tool.packer.CodePacker;
-import cn.reghao.devops.common.build.tool.packer.DockerPack;
-import cn.reghao.devops.common.build.tool.packer.ZipPack;
-import cn.reghao.devops.common.build.tool.repo.CodeUpdater;
-import cn.reghao.devops.common.build.tool.repo.GitImpl;
+import cn.reghao.devops.common.docker.Docker;
 import cn.reghao.devops.common.docker.DockerImpl;
 import cn.reghao.devops.common.msg.constant.PackType;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.CompilerDto;
+import cn.reghao.devops.manager.build.model.PackerDto;
+import cn.reghao.devops.manager.build.model.RepoAuth;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.model.constant.RepoType;
+import cn.reghao.devops.manager.build.tool.compiler.CodeCompiler;
+import cn.reghao.devops.manager.build.tool.compiler.EmptyCompiler;
+import cn.reghao.devops.manager.build.tool.compiler.MavenCompiler;
+import cn.reghao.devops.manager.build.tool.compiler.ShellCompiler;
+import cn.reghao.devops.manager.build.tool.packer.CodePacker;
+import cn.reghao.devops.manager.build.tool.packer.DockerPack;
+import cn.reghao.devops.manager.build.tool.packer.ZipPack;
+import cn.reghao.devops.manager.build.tool.repo.CodeUpdater;
+import cn.reghao.devops.manager.build.tool.repo.GitImpl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -80,6 +81,7 @@ public class BuildTools {
         }
         buildConfig.computeIfAbsent(appId, k -> new HashMap<>()).put("codeUpdater", repoAuthName);
 
+        Docker docker = new DockerImpl();
         CompilerDto compilerDto = appDto.getBuildConfigDto().getCompilerDto();
         String compilerName = compilerDto.getName();
         CodeCompiler codeCompiler = codeCompilerMap.get(compilerName);
@@ -91,6 +93,7 @@ public class BuildTools {
                 case maven:
                     codeCompiler = new MavenCompiler(compilerDto.getHomePath());
                     break;
+                case docker:
                 case none:
                     codeCompiler = new EmptyCompiler();
                     break;
@@ -107,7 +110,7 @@ public class BuildTools {
         if (codePacker == null) {
             switch (PackType.valueOf(packerDto.getType())) {
                 case docker:
-                    codePacker = new DockerPack(packerDto.getTargetPath(), new DockerImpl());
+                    codePacker = new DockerPack(packerDto.getTargetPath(), docker);
                     break;
                 default:
                     codePacker = new ZipPack(packerDto.getBinDirname());

common/src/main/java/cn/reghao/devops/common/build/chain/Handler.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/Handler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/devops/common/build/chain/HandlerParam.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/HandlerParam.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
 import java.io.Serializable;
 

common/src/main/java/cn/reghao/devops/common/build/chain/HandlerResult.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/HandlerResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.chain;
+package cn.reghao.devops.manager.build.chain;
 
 import java.io.Serializable;
 

common/src/main/java/cn/reghao/devops/common/build/chain/impl/BuildChainParam.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/impl/BuildChainParam.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.common.build.chain.impl;
+package cn.reghao.devops.manager.build.chain.impl;
 
-import cn.reghao.devops.common.build.chain.HandlerParam;
-import cn.reghao.devops.common.build.model.AppDto;
+import cn.reghao.devops.manager.build.chain.HandlerParam;
+import cn.reghao.devops.manager.build.model.AppDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

common/src/main/java/cn/reghao/devops/common/build/chain/impl/BuildChainResult.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/impl/BuildChainResult.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.common.build.chain.impl;
+package cn.reghao.devops.manager.build.chain.impl;
 
-import cn.reghao.devops.common.build.chain.HandlerResult;
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.BuildConfigDto;
-import cn.reghao.devops.common.build.model.BuildConsumedDto;
-import cn.reghao.devops.common.build.tool.repo.CommitInfo;
+import cn.reghao.devops.manager.build.chain.HandlerResult;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.BuildConfigDto;
+import cn.reghao.devops.manager.build.model.BuildConsumedDto;
+import cn.reghao.devops.manager.build.tool.repo.CommitInfo;
 import cn.reghao.jutil.jdk.result.Result;
 import lombok.Getter;
 import lombok.Setter;

common/src/main/java/cn/reghao/devops/common/build/chain/impl/CompileHandler.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/impl/CompileHandler.java

@@ -1,12 +1,12 @@
-package cn.reghao.devops.common.build.chain.impl;
+package cn.reghao.devops.manager.build.chain.impl;
 
-import cn.reghao.devops.common.build.chain.BuildTools;
-import cn.reghao.devops.common.build.chain.Handler;
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.CompilerDto;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
-import cn.reghao.devops.common.build.model.constant.CompileType;
-import cn.reghao.devops.common.build.tool.compiler.CodeCompiler;
+import cn.reghao.devops.manager.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.Handler;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.CompilerDto;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.tool.compiler.CodeCompiler;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
@@ -33,6 +33,8 @@ public class CompileHandler extends Handler<BuildChainParam, BuildChainResult> {
             codeCompiler.compile(appId, compileDir, appDto.getEnv(), appDto.getAppRootPath());
         } else if (compileType.equals(CompileType.shell.getName())) {
             codeCompiler.compile(appId, compileDir);
+        } else if (compileType.equals(CompileType.docker.getName())) {
+            codeCompiler.compile(appId, compileDir);
         } else if (compileType.equals(CompileType.none.getName())) {
 
         } else {

common/src/main/java/cn/reghao/devops/common/build/chain/impl/PackHandler.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/impl/PackHandler.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.common.build.chain.impl;
+package cn.reghao.devops.manager.build.chain.impl;
 
-import cn.reghao.devops.common.build.chain.BuildTools;
-import cn.reghao.devops.common.build.chain.Handler;
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
-import cn.reghao.devops.common.build.tool.packer.CodePacker;
+import cn.reghao.devops.manager.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.Handler;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.tool.packer.CodePacker;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

common/src/main/java/cn/reghao/devops/common/build/chain/impl/UpdateHandler.java → manager/src/main/java/cn/reghao/devops/manager/build/chain/impl/UpdateHandler.java

@@ -1,12 +1,12 @@
-package cn.reghao.devops.common.build.chain.impl;
+package cn.reghao.devops.manager.build.chain.impl;
 
-import cn.reghao.devops.common.build.chain.BuildTools;
-import cn.reghao.devops.common.build.chain.Handler;
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
-import cn.reghao.devops.common.build.tool.BuilderUtil;
-import cn.reghao.devops.common.build.tool.repo.CodeUpdater;
-import cn.reghao.devops.common.build.tool.repo.CommitInfo;
+import cn.reghao.devops.manager.build.chain.BuildTools;
+import cn.reghao.devops.manager.build.chain.Handler;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.tool.BuilderUtil;
+import cn.reghao.devops.manager.build.tool.repo.CodeUpdater;
+import cn.reghao.devops.manager.build.tool.repo.CommitInfo;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

common/src/main/java/cn/reghao/devops/common/build/model/AppDto.java → manager/src/main/java/cn/reghao/devops/manager/build/model/AppDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

common/src/main/java/cn/reghao/devops/common/build/model/BuildConfigDto.java → manager/src/main/java/cn/reghao/devops/manager/build/model/BuildConfigDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

common/src/main/java/cn/reghao/devops/common/build/model/BuildConsumedDto.java → manager/src/main/java/cn/reghao/devops/manager/build/model/BuildConsumedDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.Getter;
 import lombok.Setter;

common/src/main/java/cn/reghao/devops/common/build/model/CompilerDto.java → manager/src/main/java/cn/reghao/devops/manager/build/model/CompilerDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

common/src/main/java/cn/reghao/devops/common/build/model/LocalBuildDir.java → manager/src/main/java/cn/reghao/devops/manager/build/model/LocalBuildDir.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import java.io.Serializable;
 

common/src/main/java/cn/reghao/devops/common/build/model/PackerDto.java → manager/src/main/java/cn/reghao/devops/manager/build/model/PackerDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

common/src/main/java/cn/reghao/devops/common/build/model/RepoAuth.java → manager/src/main/java/cn/reghao/devops/manager/build/model/RepoAuth.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model;
+package cn.reghao.devops.manager.build.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

common/src/main/java/cn/reghao/devops/common/build/model/constant/CompileType.java → manager/src/main/java/cn/reghao/devops/manager/build/model/constant/CompileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model.constant;
+package cn.reghao.devops.manager.build.model.constant;
 
 /**
  * 编译方式类型
@@ -7,7 +7,7 @@ package cn.reghao.devops.common.build.model.constant;
  * @date 2019-10-18 14:31:29
  */
 public enum CompileType {
-    none, shell, maven;
+    none, shell, maven, docker;
 
     public String getName() {
         return this.name();

common/src/main/java/cn/reghao/devops/common/build/model/constant/EnvType.java → manager/src/main/java/cn/reghao/devops/manager/build/model/constant/EnvType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model.constant;
+package cn.reghao.devops.manager.build.model.constant;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/devops/common/build/model/constant/RepoAuthType.java → manager/src/main/java/cn/reghao/devops/manager/build/model/constant/RepoAuthType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model.constant;
+package cn.reghao.devops.manager.build.model.constant;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/devops/common/build/model/constant/RepoType.java → manager/src/main/java/cn/reghao/devops/manager/build/model/constant/RepoType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.model.constant;
+package cn.reghao.devops.manager.build.model.constant;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/devops/common/build/tool/BuilderUtil.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/BuilderUtil.java

@@ -1,9 +1,9 @@
-package cn.reghao.devops.common.build.tool;
+package cn.reghao.devops.manager.build.tool;
 
-import cn.reghao.devops.common.build.model.AppDto;
-import cn.reghao.devops.common.build.model.LocalBuildDir;
 import cn.reghao.devops.common.util.text.FileProcessor;
 import cn.reghao.devops.common.util.text.ReplaceCharacter;
+import cn.reghao.devops.manager.build.model.AppDto;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

common/src/main/java/cn/reghao/devops/common/build/tool/compiler/CodeCompiler.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/compiler/CodeCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.compiler;
+package cn.reghao.devops.manager.build.tool.compiler;
 
 /**
  * 编译代码

common/src/main/java/cn/reghao/devops/common/build/tool/compiler/EmptyCompiler.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/compiler/EmptyCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.compiler;
+package cn.reghao.devops.manager.build.tool.compiler;
 
 /**
  * 没有编译器

common/src/main/java/cn/reghao/devops/common/build/tool/compiler/MavenCompiler.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/compiler/MavenCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.compiler;
+package cn.reghao.devops.manager.build.tool.compiler;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.maven.model.Model;

common/src/main/java/cn/reghao/devops/common/build/tool/compiler/ShellCompiler.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/compiler/ShellCompiler.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.common.build.tool.compiler;
+package cn.reghao.devops.manager.build.tool.compiler;
 
-import cn.reghao.devops.common.build.model.CompilerDto;
+import cn.reghao.devops.manager.build.model.CompilerDto;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.shell.ShellExecutor;
 import cn.reghao.jutil.jdk.shell.ShellResult;

common/src/main/java/cn/reghao/devops/common/build/tool/packer/CodePacker.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/packer/CodePacker.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.packer;
+package cn.reghao.devops.manager.build.tool.packer;
 
 /**
  * 打包应用

common/src/main/java/cn/reghao/devops/common/build/tool/packer/DockerPack.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/packer/DockerPack.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.packer;
+package cn.reghao.devops.manager.build.tool.packer;
 
 import cn.reghao.devops.common.docker.Docker;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/cn/reghao/devops/common/build/tool/packer/ZipFiles.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/packer/ZipFiles.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.packer;
+package cn.reghao.devops.manager.build.tool.packer;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

common/src/main/java/cn/reghao/devops/common/build/tool/packer/ZipPack.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/packer/ZipPack.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.common.build.tool.packer;
+package cn.reghao.devops.manager.build.tool.packer;
 
-import cn.reghao.devops.common.build.model.LocalBuildDir;
+import cn.reghao.devops.manager.build.model.LocalBuildDir;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 

common/src/main/java/cn/reghao/devops/common/build/tool/repo/ChangedFile.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/ChangedFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/devops/common/build/tool/repo/CodeUpdater.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/CodeUpdater.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
 /**
  * 更新代码

common/src/main/java/cn/reghao/devops/common/build/tool/repo/CommitInfo.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/CommitInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

common/src/main/java/cn/reghao/devops/common/build/tool/repo/CustomCredentialProvider.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/CustomCredentialProvider.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
 import org.eclipse.jgit.errors.UnsupportedCredentialItem;
 import org.eclipse.jgit.transport.CredentialItem;

common/src/main/java/cn/reghao/devops/common/build/tool/repo/CustomSshSessionFactory.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/CustomSshSessionFactory.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
 import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
 import org.eclipse.jgit.util.FS;

common/src/main/java/cn/reghao/devops/common/build/tool/repo/GitImpl.java → manager/src/main/java/cn/reghao/devops/manager/build/tool/repo/GitImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.common.build.tool.repo;
+package cn.reghao.devops.manager.build.tool.repo;
 
-import cn.reghao.devops.common.build.model.RepoAuth;
-import cn.reghao.devops.common.build.model.constant.RepoAuthType;
+import cn.reghao.devops.manager.build.model.RepoAuth;
+import cn.reghao.devops.manager.build.model.constant.RepoAuthType;
 import org.eclipse.jgit.api.*;
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.internal.storage.file.FileRepository;

manager/src/main/java/cn/reghao/devops/manager/config/spring/AppLifecycle.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.config.spring;
 
-import cn.reghao.devops.common.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
 import cn.reghao.devops.manager.account.service.AccountService;
 import cn.reghao.devops.manager.account.service.FileService;
 import cn.reghao.devops.manager.account.service.RoleService;

manager/src/main/java/cn/reghao/devops/manager/machine/controller/page/MachineHostPageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.machine.controller.page;
 
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
 import cn.reghao.devops.manager.machine.model.SshConnData;
 import cn.reghao.devops.manager.machine.model.po.MachineHost;

manager/src/main/java/cn/reghao/devops/manager/template/attribute/SelectDictAttrProcessor.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.template.attribute;
 
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.manager.account.model.constant.MenuType;
 import cn.reghao.devops.manager.account.model.constant.RoleType;
 import cn.reghao.devops.manager.account.service.UserContext;

manager/src/main/java/cn/reghao/devops/manager/util/DefaultSetting.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.util;
 
-import cn.reghao.devops.common.build.model.constant.EnvType;
+import cn.reghao.devops.manager.build.model.constant.EnvType;
 import cn.reghao.devops.manager.account.service.UserContext;
 import cn.reghao.devops.manager.app.model.constant.AppType;
 import cn.reghao.devops.manager.account.model.constant.RoleType;

manager/src/main/java/cn/reghao/devops/manager/util/validator/provider/CompilerConfigGroupSequenceProvider.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.util.validator.provider;
 
-import cn.reghao.devops.common.build.model.constant.CompileType;
+import cn.reghao.devops.manager.build.model.constant.CompileType;
 import cn.reghao.devops.manager.app.model.po.config.build.CompilerConfig;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 

manager/src/main/java/cn/reghao/devops/manager/util/validator/provider/RepoAuthGroupSequenceProvider.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.util.validator.provider;
 
-import cn.reghao.devops.common.build.model.constant.RepoAuthType;
+import cn.reghao.devops.manager.build.model.constant.RepoAuthType;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 

manager/src/test/java/DockerTest.java

@@ -1,5 +1,4 @@
 import cn.reghao.devops.common.docker.DockerImpl;
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import org.junit.Test;
 
@@ -31,7 +30,6 @@ public class DockerTest {
     @Test
     public void dockerTest() {
         DockerImpl docker = new DockerImpl();
-        InspectContainerResponse containerInfo = docker.ps("dnkt-admin");
 
         List<Container> list = docker.ps(true);
         list.forEach(container -> {

manager/src/test/java/GitTest.java

@@ -1,5 +1,5 @@
-import cn.reghao.devops.common.build.model.constant.RepoAuthType;
-import cn.reghao.devops.common.build.tool.repo.GitImpl;
+import cn.reghao.devops.manager.build.model.constant.RepoAuthType;
+import cn.reghao.devops.manager.build.tool.repo.GitImpl;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;