Commit aceacc36 authored by zhouzihao's avatar zhouzihao

fix-修复部署测试环境的bug

parent 2bb71eae
...@@ -13,11 +13,11 @@ module.exports = { ...@@ -13,11 +13,11 @@ module.exports = {
var version = body.version; var version = body.version;
// 接受是否发布的数据 没有传的情况下默认没有发布 // 接受是否发布的数据 没有传的情况下默认没有发布
var is_deploy = _.isEmpty(body.is_deploy) ? false : body.is_deploy; var is_deploy = _.has(body, "is_deploy") ? body.is_deploy : false;
//todo 这里的值是字符串还对象 //todo 这里的值是字符串还对象
var deploy_list = _.isEmpty(body.deploy_list) ? [] : body.deploy_list; var deploy_list = _.isEmpty(body.deploy_list) ? [] : body.deploy_list;
var result = await buildshell.build(p_id, env_id, branch, version,is_deploy,deploy_list); var result = await buildshell.build(p_id, env_id, branch, version, is_deploy, deploy_list);
res.end("{\"success\":true}"); res.end("{\"success\":true}");
} catch (error) { } catch (error) {
console.log(error); console.log(error);
......
...@@ -149,8 +149,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio ...@@ -149,8 +149,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
} }
deploy_name = envObj.name + "-" + module_name; deploy_name = envObj.name + "-" + module_name;
if (_.isObject(v) && _.has(v, `devlop.${envObj.name}`)) { if (_.isObject(v) && _.has(v, `deploy.${envObj.name}`)) {
deploy_name = _.get(v, `devlop.${envObj, name}`); deploy_name = _.get(v, `deploy.${envObj.name}`);
} }
var pom_object = await pomParserPromise(opt); var pom_object = await pomParserPromise(opt);
...@@ -175,7 +175,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio ...@@ -175,7 +175,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
docker_push_str += " " + '- docker push ${IMAGE_LATEST_' + service_name + '}' + "\n"; docker_push_str += " " + '- docker push ${IMAGE_LATEST_' + service_name + '}' + "\n";
//部署指令 //部署指令
if (is_deploy) { if (is_deploy && deploy_list.indexOf(module_name) > 0) {
deploy_str += " " + `- docker service update --image ${envObj.registry_url}/${registry_group}/${project_name}/${image_name}:${version} ${deploy_name}` + "\n" deploy_str += " " + `- docker service update --image ${envObj.registry_url}/${registry_group}/${project_name}/${image_name}:${version} ${deploy_name}` + "\n"
} }
// 这里要写dockerfile // 这里要写dockerfile
...@@ -223,7 +223,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio ...@@ -223,7 +223,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
"{success_str}": success_str, "{success_str}": success_str,
"{fail_str}": fail_str, "{fail_str}": fail_str,
"{deploy_str}": _.trimEnd(deploy_str, "\n"), "{deploy_str}": _.trimEnd(deploy_str, "\n"),
"{tag}":envObj.name, "{tag}": envObj.name,
}; };
await replaceFileByMap(gitlab_ci_map, `${project_dir}/.gitlab-ci.yml`); await replaceFileByMap(gitlab_ci_map, `${project_dir}/.gitlab-ci.yml`);
// 提供gitlab-ci // 提供gitlab-ci
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment