dev-提交代码

shell/java.js

@@ -104,7 +104,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
 
     // 先看看build语句
     // 默认跳过测试
-    var build_script = _.get(projectMetaData, "build_script", "mvn clean install package -Dmaven.test.skip=true");
+    var build_script = _.get(projectMetaData, "build_script", "    -mvn clean install package -Dmaven.test.skip=true");
     // 识别要扫描的模块 
     var module_list = _.get(projectMetaData, "module_list", ["."]);
     // 初始化变量
@@ -130,7 +130,6 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         var pom_object = await pomParserPromise(opt);
         // console.log(JSON.stringify(pom_object));
         // 这里默认情况下使用通配符
-        var executeFIle = "*.jar";
 
         var service_name = pom_object.project.name;
         var dockerfile_name = "dockerfile_" + service_name;
@@ -145,6 +144,13 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         docker_push_str += "    " + '- docker push ${IMAGE_VERSION-' + service_name + '}' + "\n";
         docker_push_str += "    " + '- docker push ${IMAGE_LATEST-' + service_name + '}' + "\n";
         // 这里要写dockerfile
+
+        fs.writeFileSync(`${project_dir}/${dockerfile_name}`, typeObj.docker_file);
+        var dockerfile_map = {
+            "{service}": v,
+            "{service-exec}": service_name + "*"
+        }
+        await replaceFileByMap(dockerfile_map, `${project_dir}/${dockerfile_name}`);
     }
 
     // 创建gitlab-ci
@@ -160,18 +166,18 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
     };
     await replaceFileByMap(gitlab_ci_map, `${project_dir}/.gitlab-ci.yml`);
     // 提供gitlab-ci
-
-    // 这个是循环的！！！！
-    // 创建dockerfile
-    // fs.writeFileSync(`${project_dir}/dockerfile`, typeObj.docker_file);
-    // 替换dokerfile
-
-
     // todo 创建docker-compose
     // 替换docker-compose
 
     // 提交上传代码
+    let { stdout9 } = await execa(`git`, ['init'], { cwd: project_dir })
+    // console.log(stdout9);
+    let { stdout10 } = await execa(`git`, ['add', '.'], { cwd: project_dir });
+    let { stdout12 } = await execa(`git`, ['commit', '-m', '"Init"'], { cwd: project_dir });
+    let { stdout13 } = await execa(`git`, ['remote', 'add', 'origin', git_remote], { cwd: project_dir });
+    let { stdout14 } = await execa(`git`, ['push', '-u', 'origin', 'master'], { cwd: project_dir });
     // 打上tag
+
 }
 
 /**