caihuaqian/bdcontract-bundle
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
fanbo 2021-12-17 13:46:08 +08:00
commit 5b46239cd6
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent-backend

@ -1 +1 @@
Subproject commit 5ffc5fb8130f4c4ed995c1b802c46f080130406e Subproject commit db5e8451b09c9d3fc570b4b90b2ba4a77d144be2

2
agent-frontend

@ -1 +1 @@
Subproject commit 37476bd50648deb653c1202fdb4cad6ab5140c82 Subproject commit 965ee674094664ddf99013eed26f6aaacac4fe01

2
build.gradle
View File

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

2
cm

@ -1 +1 @@
Subproject commit 9657f1930f6a6fc0e3030483d0f248487287542a Subproject commit c3f1407b6fbc2b7e59b050c1e72c9c0a95c59f48

2
common

@ -1 +1 @@
Subproject commit b0ef7bbf100336f4e1b2dea6b7c0ec91afef29f2 Subproject commit 8548c5ea00ac0158d5ba3786d2bf4ae2fbb8a41b

4
docker/AgentDockerfile
View File

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

4
docker/ClusterDockerfile
View File

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

2
docker/buildClusterDocker.sh
View File

@ -11,7 +11,7 @@ if [ $# -lt 1 ]; then
fi fi
#linux/arm64/v8, #linux/arm64/v8,
if [ "$2" == "push" ]; then 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 elif [ "$2" == "save" ]; then
docker buildx build --platform linux/amd64 -t bdware/bdcluster:$1 ./ --load docker buildx build --platform linux/amd64 -t bdware/bdcluster:$1 ./ --load
docker save -o $3/bdcluster-$1.tar bdware/bdcluster:$1 docker save -o $3/bdcluster-$1.tar bdware/bdcluster:$1

2
front-base

@ -1 +1 @@
Subproject commit c8cf9cca586da1b2df260cc2eb6a7ad3441eb7f5 Subproject commit 05a8a992db8d4f0190c50791dbceb2a2ae4e80a7

2
genparser

@ -1 +1 @@
Subproject commit 705d271e0cbbf18cc8454a2a4c951d96fcfcc13e Subproject commit 68661c63944659ed8a769d1df102ed8e9f7a8804

2
mockjava

@ -1 +1 @@
Subproject commit 433793771a4d09afab268d92b2403c4cd5a66250 Subproject commit 293810f23679b5ccef7fbbb6a55e431c42f518dc

2
router-backend

@ -1 +1 @@
Subproject commit bf14fd6adb3472ce247bd468128bdbe7c8c3e6d9 Subproject commit d5638662debd1c82d56df4d40e32646b83af108a