Authored by qinchao

gitwebhook

@@ -106,13 +106,16 @@ public class DockerProjectCtrl { @@ -106,13 +106,16 @@ public class DockerProjectCtrl {
106 log.info("gitWebHook run "); 106 log.info("gitWebHook run ");
107 //Docker-Deploy-GitHook 107 //Docker-Deploy-GitHook
108 DockerJenkinsReq dockerJenkinsReq=new DockerJenkinsReq(); 108 DockerJenkinsReq dockerJenkinsReq=new DockerJenkinsReq();
109 - dockerJenkinsReq.setDeployName(model.getProjectName()); 109 + dockerJenkinsReq.setProjectName(model.getProjectName());
  110 + dockerJenkinsReq.setProjectJobType(model.getProjectJobType());
110 dockerJenkinsReq.setProjectGitGroup(model.getProjectGitGroup()); 111 dockerJenkinsReq.setProjectGitGroup(model.getProjectGitGroup());
111 dockerJenkinsReq.setDeployName(model.getDockerProjectName()); 112 dockerJenkinsReq.setDeployName(model.getDockerProjectName());
112 dockerJenkinsReq.setBranch("master"); 113 dockerJenkinsReq.setBranch("master");
113 dockerJenkinsReq.setUserMail(webHooksReleaseBO.getUser_email()); 114 dockerJenkinsReq.setUserMail(webHooksReleaseBO.getUser_email());
114 dockerJenkinsReq.setImageSource(model.getDockerOnlineImageStore()); 115 dockerJenkinsReq.setImageSource(model.getDockerOnlineImageStore());
115 dockerJenkinsReq.setNodeEnv("yoho-online"); 116 dockerJenkinsReq.setNodeEnv("yoho-online");
  117 + dockerJenkinsReq.setProjectPort(model.getPort());
  118 + dockerJenkinsReq.setClusterId(model.getDockerOnlineClusterId());
116 119
117 log.info("gitWebHook run {} ",dockerJenkinsReq); 120 log.info("gitWebHook run {} ",dockerJenkinsReq);
118 dockerProjectService.jenkinsBuild(dockerJenkinsReq); 121 dockerProjectService.jenkinsBuild(dockerJenkinsReq);