From a7820c499a9732160a0d672318f315163801c33c Mon Sep 17 00:00:00 2001
From: chu fan <fairy_408@2925.com>
Date: Wed, 6 Sep 2023 18:51:59 +0800
Subject: [PATCH] release v0.0.1-alpha.0

---
 scripts/.exec  | 15 +++++++++------
 scripts/bundle |  4 +++-
 scripts/deploy | 33 +++++++++++++++++++++------------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/scripts/.exec b/scripts/.exec
index 57204de..b1ef1aa 100755
--- a/scripts/.exec
+++ b/scripts/.exec
@@ -52,16 +52,18 @@ exports.execShell = async commands => {
         runCommands=commands
     }
 
-    for (const command of runCommands) {
-      console.log(`>>>command:\n ${command} \n<<<start  === \n`)
+    for (let index=0;index<runCommands.length;index++) {
+      const command=runCommands[index]
+      const count=index+1
+      console.log(`>>>command--${count}:\n ${command} \n<<<command--${count}--start  === \n`)
       // await syncExec(command)
-      const {code}=await exec(command)
+      const execResult=await exec(command)
+
+      console.log(`<<<command--${count}--ending === `)
       // 指令异常，不执行后续指令
-      if(code!==0){
+      if(execResult.code!==0){
         break;
       }
-
-      console.log(`<<<ending === `)
     }
 }
 
@@ -76,3 +78,4 @@ exports.BaseSetting={
   // 定义时间
   currentTime:'$(date "+%Y-%m-%d %H:%M:%S")'
 }
+
diff --git a/scripts/bundle b/scripts/bundle
index 5cae7f3..27210f9 100755
--- a/scripts/bundle
+++ b/scripts/bundle
@@ -45,8 +45,10 @@ function getBuildImageScript(faster){
           docker push ${imageName}
           echo  "---------------- 上传镜像成功，删除本地镜像 ---------------- "
           docker rmi ${imageName}
+          exit 0;
         else
           echo "镜像: ${imageName} , 不存在"
+          exit 1;
         fi
       `
     ]
@@ -112,6 +114,6 @@ async function getScriptCommand(){
     console.log(`>>>> ${scriptCommand} `)
 
     // 执行
-    await execShell(scriptCommand)
+    // await execShell(scriptCommand)
 })()
 
diff --git a/scripts/deploy b/scripts/deploy
index 5544ae8..1db9758 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -12,8 +12,8 @@ const dockerDeployInfo={
     repoAddress:"registry.cn-hangzhou.aliyuncs.com/142vip/doc_book",
     containerName:'408CSFamily',
     networkName:'service_env_net',
-    imageName:`${this.repoAddress}:${this.containerName}-${packageVersion}`
 }
+const imageName=`${dockerDeployInfo.repoAddress}:${dockerDeployInfo.containerName}-${packageVersion}`
 
 // 支持的命令
 const SupportScripts={
@@ -27,31 +27,39 @@ const SupportScripts={
         git config --list
         git commit -m "release v${packageVersion}"
         ## 部署到github pages
-        git push -f https://github.com/mmdapl/408CSFamily.git main:pages/github
+        git push -f https://github.com/mmdapl/408CSFamily.git master:pages/github
         cd -
       `,
     Ali:[
       // 容器存在即删除
       `
-        docker inspect ${dockerDeployInfo.containerName} -f '{{.Name}}' > /dev/null 
-        if [ $? -eq 0 ] ;then 
+        if docker inspect --format='{{.State.Running}}' ${dockerDeployInfo.containerName} >/dev/null 2>&1;then
           docker rm -f ${dockerDeployInfo.containerName}
+          exit 0;
+        else
+          echo "容器：${dockerDeployInfo.containerName}，不存在"
+          exit 1;
         fi
       `,
       // 镜像存在即删除
       `
-        if [[ "$(docker images -q ${dockerDeployInfo.imageName} 2> /dev/null)" != "" ]];then 
-          docker rmi ${dockerDeployInfo.imageName}
+        if [[ "$(docker images -q ${imageName} 2> /dev/null)" != "" ]];then 
+          docker rmi ${imageName}
+          exit 0;
+        else
+          echo -e "镜像：${imageName}，不存在"
+          exit 1;
         fi
       `,
       // 运行容器
       `
-        docker run -d --name ${dockerDeployInfo.containerName} 
-        -p 7000:80 
-        --network=${dockerDeployInfo.networkName}  
-        --restart=unless-stopped 
-        --ip=172.30.0.100 
-        ${dockerDeployInfo.imageName}`,
+        docker run -d --name ${dockerDeployInfo.containerName} \
+        -p 7000:80 \
+        --network=${dockerDeployInfo.networkName}  \
+        --restart=unless-stopped \
+        --ip=172.30.0.100 \
+        ${imageName}
+       `,
     ]
 }
 
@@ -76,5 +84,6 @@ function getDeployCommand(){
 // 执行
 ;(async ()=>{
     const deployCommand=getDeployCommand()
+    // console.log(deployCommand)
     await execShell(deployCommand)
 })()
\ No newline at end of file