|
@@ -3,6 +3,7 @@ package cn.seecoder.web.core.pipeline.handler;
|
|
|
import cn.seecoder.web.core.pipeline.Context;
|
|
import cn.seecoder.web.core.pipeline.Context;
|
|
|
import cn.seecoder.web.core.pipeline.PipelineException;
|
|
import cn.seecoder.web.core.pipeline.PipelineException;
|
|
|
import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
|
|
import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
|
|
|
|
|
+import cn.seecoder.web.service.pipeline.PipelineService;
|
|
|
import com.spotify.docker.client.ProgressHandler;
|
|
import com.spotify.docker.client.ProgressHandler;
|
|
|
import com.spotify.docker.client.exceptions.DockerException;
|
|
import com.spotify.docker.client.exceptions.DockerException;
|
|
|
import com.spotify.docker.client.messages.ProgressMessage;
|
|
import com.spotify.docker.client.messages.ProgressMessage;
|
|
@@ -36,9 +37,12 @@ public class NodeImageBuildHandler extends AbstractHandler{
|
|
|
|
|
|
|
|
public final GitApi gitApi;
|
|
public final GitApi gitApi;
|
|
|
|
|
|
|
|
|
|
+ public final PipelineService pipelineService;
|
|
|
|
|
+
|
|
|
public NodeImageBuildHandler() {
|
|
public NodeImageBuildHandler() {
|
|
|
dockerApi = SpringUtil.getBean(DockerApi.class);
|
|
dockerApi = SpringUtil.getBean(DockerApi.class);
|
|
|
gitApi = SpringUtil.getBean(GitApi.class);
|
|
gitApi = SpringUtil.getBean(GitApi.class);
|
|
|
|
|
+ pipelineService = SpringUtil.getBean(PipelineService.class);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private String repoUrl;
|
|
private String repoUrl;
|
|
@@ -50,7 +54,7 @@ public class NodeImageBuildHandler extends AbstractHandler{
|
|
|
@Override
|
|
@Override
|
|
|
public void process(Context context) throws PipelineException {
|
|
public void process(Context context) throws PipelineException {
|
|
|
//0. 变量准备
|
|
//0. 变量准备
|
|
|
- String templateName = PipelineTemplateTable.NODE_10;
|
|
|
|
|
|
|
+ String templateName = pipelineService.getTemplateNameById(context.getPipelineId());
|
|
|
String imageName = context.getNamespace() + "-" + context.getDeployName();
|
|
String imageName = context.getNamespace() + "-" + context.getDeployName();
|
|
|
|
|
|
|
|
// 1. 有git从git拿到地址仓库
|
|
// 1. 有git从git拿到地址仓库
|