Merge pull request #132 from mmdapl/feat/add-jenkins

Author: 微信公众号：储凡

code/docker/jenkins/docker-compose.yaml

@@ -13,20 +13,20 @@ services:
   jenkins:
     image: jenkins/jenkins
     container_name: jenkins
+    ## 权限问题 使用root用户
+    user: root
+    privileged: true
     hostname: jenkins_dev
     restart: unless-stopped
     ports:
       - "6080:8080"
       - "6081:50000"
-    ## 文件映射
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - $(pwd)/jenkins:/var/jenkins_home
       ## 支持容器内使用Mac本机docker服务
-      ## - /usr/local/bin/docker:/usr/bin/docker
+      ## - /usr/bin/docker:/usr/bin/docker
       ## - /var/run/docker.sock:/var/run/docker.sock
     environment:
       JENKINS_OPTS: "--prefix=/jenkins"
       JENKINS_ARGS: "--prefix=/jenkins"
-    # 用户名
-    user: root

scripts/.exec

@@ -29,19 +29,20 @@ exports.execShell = async commands => {
     runCommands = commands
   }
 
+  // 执行多条
   for (let index = 0; index < runCommands.length; index++) {
     const command = runCommands[index]
     const count = index + 1
     console.log(`step${count}:\n${command} \nstep${count}(start):  === `)
     // await syncExec(command)
     const execResult = await exec(command)
     // 打印输出结果
-    console.log(execResult.stdout);
+    // console.log(1111,execResult.stdout);
     console.log(`step${count}(ending): === \n`)
     // 指令异常，不执行后续指令，非0退出
     if (execResult.code !== 0) {
       exit(1)
       break;
     }
   }
-}
+}

scripts/bundle

@@ -164,7 +164,12 @@ async function getScriptCommand() {
 
 
 ;(async() => {
-  const scriptCommand = await getScriptCommand()
-  await execShell(scriptCommand)
+  try{
+    const scriptCommand = await getScriptCommand()
+    await execShell(scriptCommand)
+  }catch (e) {
+    console.log('异常信息:',e)
+  }
+
 })()