Merge remote-tracking branch 'origin/master'

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'idea'
 }
-def currVersion = "1.6.0"
+def currVersion = "1.6.5"
 ext.projectIds = ['group': 'com.bdware.sc', 'version': currVersion]
 sourceCompatibility = 1.8
 

docker/AgentDockerfile

@@ -4,9 +4,9 @@ ARG GOPRIVATE=bdware.org/*
 ARG GOPROXY=https://goproxy.cn
 
 LABEL maintainer="caihuaqian@internetapi.cn"
-LABEL org.bdware.version="1.6.0"
+LABEL org.bdware.version="1.6.5"
 LABEL org.bdware.version.isproduction="true"
-LABEL org.bdware.release-date="2021-12-02"
+LABEL org.bdware.release-date="2021-12-12"
 
 COPY ./output /bdcontract
 WORKDIR /bdcontract

docker/ClusterDockerfile

@@ -4,9 +4,9 @@ ARG GOPRIVATE=bdware.org/*
 ARG GOPROXY=https://goproxy.cn
 
 LABEL maintainer="caihuaqian@internetapi.cn"
-LABEL org.bdware.version="1.6.0"
+LABEL org.bdware.version="1.6.5"
 LABEL org.bdware.version.isproduction="false"
-LABEL org.bdware.release-date="2021-12-02"
+LABEL org.bdware.release-date="2021-12-12"
 
 COPY ./output /bdcluster
 WORKDIR /bdcluster

docker/buildClusterDocker.sh

@@ -11,7 +11,7 @@ if [ $# -lt 1 ]; then
 fi
 #linux/arm64/v8,
 if [ "$2" == "push" ]; then
-  docker buildx build --platform linux/amd64,linux/arm64/v8 -t bdware/bdcluster:$1.arm64 ./ --push
+  docker buildx build --platform linux/amd64,linux/arm64/v8 -t bdware/bdcluster:$1 ./ --push
 elif [ "$2" == "save" ]; then
   docker buildx build --platform linux/amd64 -t bdware/bdcluster:$1 ./ --load
   docker save -o $3/bdcluster-$1.tar bdware/bdcluster:$1
@@ -19,4 +19,4 @@ else
   # docker buildx build --platform linux/arm64/v8 -t bdware/bdcluster:$1 ./ --load
   docker build -t bdware/bdcluster:$1 ./
   docker tag bdware/bdcluster:$1 bdware/bdcluster:latest
-fi
+fi