From 583251073724c5f42accf02b02363955006691a5 Mon Sep 17 00:00:00 2001
From: "fengyu.wang" <wfyv@qq.com>
Date: Sun, 5 Jul 2020 00:12:51 +0800
Subject: [PATCH] integration shell update

---
 blockchain-server/blockchain-server-btc/run.sh      | 5 ++++-
 blockchain-server/blockchain-server-cct/run.sh      | 5 ++++-
 blockchain-server/blockchain-server-currency/run.sh | 5 ++++-
 blockchain-server/blockchain-server-databot/run.sh  | 5 ++++-
 blockchain-server/blockchain-server-eos/run.sh      | 5 ++++-
 blockchain-server/blockchain-server-eth/run.sh      | 5 ++++-
 blockchain-server/blockchain-server-imJg/run.sh     | 5 ++++-
 blockchain-server/blockchain-server-otc/run.sh      | 5 ++++-
 blockchain-server/blockchain-server-sysconf/run.sh  | 5 ++++-
 blockchain-server/blockchain-server-user/run.sh     | 5 ++++-
 blockchain-server/blockchain-server-yyyf/run.sh     | 5 ++++-
 build.sh                                            | 6 +++++-
 spring-cloud/spring-cloud-config/run.sh             | 5 ++++-
 spring-cloud/spring-cloud-eureka/run.sh             | 5 ++++-
 tx-lcn/tx-manager/run.sh                            | 5 ++++-
 15 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/blockchain-server/blockchain-server-btc/run.sh b/blockchain-server/blockchain-server-btc/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-btc/run.sh
+++ b/blockchain-server/blockchain-server-btc/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-cct/run.sh b/blockchain-server/blockchain-server-cct/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-cct/run.sh
+++ b/blockchain-server/blockchain-server-cct/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-currency/run.sh b/blockchain-server/blockchain-server-currency/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-currency/run.sh
+++ b/blockchain-server/blockchain-server-currency/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-databot/run.sh b/blockchain-server/blockchain-server-databot/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-databot/run.sh
+++ b/blockchain-server/blockchain-server-databot/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-eos/run.sh b/blockchain-server/blockchain-server-eos/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-eos/run.sh
+++ b/blockchain-server/blockchain-server-eos/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-eth/run.sh b/blockchain-server/blockchain-server-eth/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-eth/run.sh
+++ b/blockchain-server/blockchain-server-eth/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-imJg/run.sh b/blockchain-server/blockchain-server-imJg/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-imJg/run.sh
+++ b/blockchain-server/blockchain-server-imJg/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-otc/run.sh b/blockchain-server/blockchain-server-otc/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-otc/run.sh
+++ b/blockchain-server/blockchain-server-otc/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-sysconf/run.sh b/blockchain-server/blockchain-server-sysconf/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-sysconf/run.sh
+++ b/blockchain-server/blockchain-server-sysconf/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-user/run.sh b/blockchain-server/blockchain-server-user/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-user/run.sh
+++ b/blockchain-server/blockchain-server-user/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/blockchain-server/blockchain-server-yyyf/run.sh b/blockchain-server/blockchain-server-yyyf/run.sh
index 70ddf26..5161dbb 100644
--- a/blockchain-server/blockchain-server-yyyf/run.sh
+++ b/blockchain-server/blockchain-server-yyyf/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/build.sh b/build.sh
index e49583f..ec82c41 100644
--- a/build.sh
+++ b/build.sh
@@ -1 +1,5 @@
-sh $(basename $(cd `dirname $0`; pwd))/*/*/run.sh
+for k in $(ls */*/run.sh)
+do
+    echo $k
+    sh $k
+done
diff --git a/spring-cloud/spring-cloud-config/run.sh b/spring-cloud/spring-cloud-config/run.sh
index 70ddf26..5161dbb 100644
--- a/spring-cloud/spring-cloud-config/run.sh
+++ b/spring-cloud/spring-cloud-config/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/spring-cloud/spring-cloud-eureka/run.sh b/spring-cloud/spring-cloud-eureka/run.sh
index 70ddf26..5161dbb 100644
--- a/spring-cloud/spring-cloud-eureka/run.sh
+++ b/spring-cloud/spring-cloud-eureka/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest
diff --git a/tx-lcn/tx-manager/run.sh b/tx-lcn/tx-manager/run.sh
index 70ddf26..5161dbb 100644
--- a/tx-lcn/tx-manager/run.sh
+++ b/tx-lcn/tx-manager/run.sh
@@ -1 +1,4 @@
-docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-`$(basename $(cd `dirname $0`; pwd)) | tr "[A-Z]" "[a-z]"` .
+workDir=$(cd `dirname $0`; pwd)
+imagesName=$(basename $workDir | tr "[A-Z]" "[a-z]")
+docker build -t registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName -f $workDir .
+docker push registry.cn-hangzhou.aliyuncs.com/god-team/client-$imagesName:latest