support ledgerparams

add startContract at cmconfig.json
add docker scripts

agent-backend

@@ -1 +1 @@
-Subproject commit b1bf67c802c8ff45bde76fe30735a106449381b2
+Subproject commit aacd9394086cff0210bb71bf6e8770847b3e9041

docker/AgentDockerfile

@@ -6,7 +6,7 @@ ARG GOPROXY=https://goproxy.cn
 LABEL maintainer="caihuaqian@internetapi.cn"
 LABEL org.bdware.version="1.6.6"
 LABEL org.bdware.version.isproduction="true"
-LABEL org.bdware.release-date="2021-12-24"
+LABEL org.bdware.release-date="1.7.0"
 
 COPY ./output /bdcontract
 WORKDIR /bdcontract

docker/ClusterDockerfile

@@ -6,7 +6,7 @@ ARG GOPROXY=https://goproxy.cn
 LABEL maintainer="caihuaqian@internetapi.cn"
 LABEL org.bdware.version="1.6.6"
 LABEL org.bdware.version.isproduction="false"
-LABEL org.bdware.release-date="2021-12-24"
+LABEL org.bdware.release-date="1.7.0"
 
 COPY ./output /bdcluster
 WORKDIR /bdcluster

docker/buildAgentDocker.sh

@@ -15,7 +15,7 @@ elif [ "$2" == "save" ]; then
   echo "save to $3"
   rm -rf ./output/BDWareProjectDir/public/TFMac
   rm -rf ./output/WebContent/bdcontract4baas
-  docker buildx build --platform linux/arm64/v8 -t bdware/bdcontract:$1 ./ --load
+  docker buildx build --platform linux/amd64 -t bdware/bdcontract:$1 ./ --load
   docker save -o $3/bdcontract-$1.tar bdware/bdcontract:$1
 else
   echo "create at local"

docker/dockerdist/README.md

@@ -0,0 +1,32 @@
+# 镜像准备
+请提前熟悉docker常用命令，主要包括`docker ps`、`docker image xx`、`docker kill`等。
+1. 下载或导入镜像：
+```bash
+#下载镜像
+docker pull bdware/bdcontract:latest
+#导入镜像，bdcontract-x.x.x.tar为待导入镜像文件。
+docker load -i bdcontract-x.x.x.tar
+```
+2. 检查是否有"bdware/bdcontract:latest"镜像。
+```bash
+docker image ls | grep bdcontract
+```
+如果没有名为"bdware/bdcontract latest"的镜像，就将其中的最新版本打上。
+docker image tag bdware/bdcontract:x.y.z bdware/bdcontract:latest
+
+# 修改配置
+1. 生成管理员密钥对。 将公钥配置到manager.key中。 格式为单行130个字符。类似于
+```
+04dad765858...
+```
+
+也可利用cp目录下的jar包自己生成:
+```bash
+#本操作需要依赖java 1.8以上环境。
+java -cp cp/libs:cp/yjs.jar org.bdware.sc.SM2Helper generateKeyToFile
+```
+生成的文件请妥善保存。
+
+2. 修改配置文件cmconfig.json（如果需要），配置文件参数详见配置说明`cmconfig.readme.md`。 
+
+3. 执行脚本`sh start.sh`

docker/dockerdist/start.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+if [ ! -d "./BDWareProjectDir" ]; then
+  mkdir ./BDWareProjectDir
+fi
+if [ ! -d "./ContractDB" ]; then
+  mkdir ./ContractDB
+fi
+
+if [ ! -d "./ContractManagerDB" ]; then
+  mkdir ./ContractManagerDB
+fi
+
+if [ ! -d "./log" ]; then
+  mkdir ./log
+fi
+
+if [ ! -d "./manager.key" ]; then
+  echo "missing manager.key! automatically generate!"
+  java -cp cp/libs:cp/yjs.jar org.bdware.sc.SM2Helper generateKeyToFile
+fi
+
+if [ ! -d "./cp" ]; then
+  echo "missing cp dir!"
+  exit 1
+fi
+
+export CURDIR=`pwd`
+
+docker run -p 21030:21030 -p 2641:2641 -p 2041:2041 -v $CURDIR/BDWareProjectDir:/bdcontract/BDWareProjectDir \
+  -v $CURDIR/ContractDB:/bdcontract/ContractDB \
+  -v $CURDIR/ContractManagerDB:/bdcontract/ContractManagerDB \
+  -v $CURDIR/cmconfig.conf:/bdcontract/cmconfig.conf \
+  -v $CURDIR/cp:/bdcontract/cp: \
+  -v $CURDIR/keys:/bdcontract/keys: \
+  -v $CURDIR/log:/bdcontract/log \
+  -v $CURDIR/manager.key:/bdcontract/manager.key: \
+  -d bdware/bdcontract:latest

docker/preparedockerdist.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+rm -rf build/dockerdist
+mkdir build/dockerdist
+cp docker/dockerdist/* build/dockerdist/
+cp ./agent-backend/cmconfig.json.template build/dockerdist/cmconfig.json
+cp -r ../cp-bundle/cp/build/output build/dockerdist/cp
+
+if [ "$2" == "push" ]; then
+
+done;

front-base

@@ -1 +1 @@
-Subproject commit a99c4e9af4ec9c2fbfaefd62ef8304ddb938c649
+Subproject commit 87ddb79d832791b78743807ca55477fceea49d24