adapt to go chassis 2.1.0 (#173)

apache · Feb 18, 2021 · 9e411a8 · 9e411a8
1 parent bd2d50c
commit 9e411a8
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 40 deletions.
diff --git a/build/build_binary.sh b/build/build_binary.sh
@@ -44,26 +44,23 @@ echo "build from ${GIT_COMMIT}"
 writeConfig(){
 echo "write chassis config..."
 cat <<EOM > ${release_dir}/conf/chassis.yaml
-cse:
-  service:
-    registry:
-      disabled: true
-      address: http://127.0.0.1:30100
+servicecomb:
+  registry:
+    disabled: true
   protocols:
     rest:
       listenAddress: 127.0.0.1:30108
-    rest-consul: #consul compatible API
-      listenAddress: 127.0.0.1:8500
   handler:
     chain:
       Provider:
         default: auth-handler,ratelimiter-provider
 EOM
 echo "write miroservice config..."
 cat <<EOM > ${release_dir}/conf/microservice.yaml
-service_description:
-  name: servicecomb-kie
-  version: ${version}
+servicecomb:
+  service:
+    name: servicecomb-kie
+    version: ${version}
 EOM
 
 cat <<EOM > ${release_dir}/conf/kie-conf.yaml

diff --git a/build/build_docker.sh b/build/build_docker.sh
@@ -22,4 +22,5 @@ cp ${PROJECT_DIR}/scripts/start.sh ./
 cp ${PROJECT_DIR}/build/docker/server/Dockerfile ./
 
 sudo docker version
-sudo docker build -t servicecomb/kie:${version} .
+sudo docker build -t servicecomb/kie:latest .
+sudo docker tag servicecomb/kie:latest servicecomb/kie:${version}
diff --git a/deployments/docker/docker-compose.yaml b/deployments/docker/docker-compose.yaml
@@ -18,7 +18,6 @@ version: '3.1'
 services:
   mongo:
     image: mongo:4.0
-    restart: always
     ports:
       - 27017:27017
     environment:
@@ -29,16 +28,14 @@ services:
       - ../db.js:/docker-entrypoint-initdb.d/db.js:ro
   mongo-express:
     image: mongo-express
-    restart: always
     ports:
       - 8081:8081
     environment:
       ME_CONFIG_MONGODB_ADMINUSERNAME: kie
       ME_CONFIG_MONGODB_ADMINPASSWORD: 123
       ME_CONFIG_MONGODB_SERVER: mongo
   servicecomb-kie:
-    image: servicecomb/kie:latest
-    restart: always
+    image: servicecomb/kie
     ports:
       - 30110:30110
     environment:

diff --git a/examples/dev/conf/lager.yaml b/examples/dev/conf/lager.yaml
@@ -1 +1 @@
-log_level: DEBUG
+logLevel: DEBUG
diff --git a/examples/dev/docker-compose.yaml b/examples/dev/docker-compose.yaml
@@ -18,7 +18,6 @@ version: '3.1'
 services:
   mongo:
     image: mongo:4.0
-    restart: always
     ports:
       - 27017:27017
     environment:
@@ -29,7 +28,6 @@ services:
       - ../../deployments/db.js:/docker-entrypoint-initdb.d/db.js:ro
   mongo-express:
     image: mongo-express
-    restart: always
     ports:
       - 8081:8081
     environment:

diff --git a/go.mod b/go.mod
@@ -1,24 +1,20 @@
 module github.com/apache/servicecomb-kie
 
 require (
-	github.com/apache/servicecomb-service-center v0.0.0-20200817025835-7bb8c4eb9421
+	github.com/apache/servicecomb-service-center v1.4.1-0.20210209095158-03e61187ded4
 	github.com/emicklei/go-restful v2.12.0+incompatible
-	github.com/go-chassis/go-archaius v1.3.6-0.20201103103813-43dd1680ebfb
-	github.com/go-chassis/go-chassis/v2 v2.1.1-0.20201208062518-9c2e86bd7a6c
-
+	github.com/go-chassis/go-archaius v1.3.6-0.20201130023516-387922b408d0
+	github.com/go-chassis/go-chassis/v2 v2.1.1-0.20201208095114-93feb76fd997
 	github.com/go-chassis/openlog v1.1.2
-	github.com/go-chassis/paas-lager v1.1.1
 	github.com/go-chassis/seclog v1.3.0
 	github.com/go-playground/universal-translator v0.17.0
 	github.com/go-playground/validator v9.31.0+incompatible
-	github.com/hashicorp/serf v0.8.5
-	github.com/leodido/go-urn v1.2.0 // indirect
-	github.com/onsi/ginkgo v1.14.0 // indirect
+	github.com/hashicorp/serf v0.9.5
+	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/stretchr/testify v1.6.1
 	github.com/urfave/cli v1.22.4
-	github.com/xdg/stringprep v1.0.0 // indirect
-	go.mongodb.org/mongo-driver v1.3.0
+	go.mongodb.org/mongo-driver v1.4.2
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/yaml.v2 v2.3.0
 )

diff --git a/go.sum b/go.sum
diff --git a/scripts/start.sh b/scripts/start.sh
@@ -26,15 +26,12 @@ fi
 writeConfig(){
 echo "write template config..."
 cat <<EOM > ${root_dir}/conf/chassis.yaml
-cse:
-  service:
-    registry:
-      disabled: true
+servicecomb:
+  registry:
+    disabled: true
   protocols:
     rest:
       listenAddress: ${listen_addr}:30110
-    rest-consul: #consul compatible API
-      listenAddress: ${listen_addr}:8500
   handler:
     chain:
       Provider:
@@ -45,19 +42,19 @@ servicecomb:
       plugin: build-in
 EOM
 cat <<EOM > ${root_dir}/conf/lager.yaml
-logger_level: ${LOG_LEVEL}
+logLevel: ${LOG_LEVEL}
 
-logger_file: log/chassis.log
+logFile: log/chassis.log
 
-log_format_text: false
+logFormatText: false
 
 rollingPolicy: size
 
-log_rotate_date: 1
+logRotateDate: 1
 
-log_rotate_size: 10
+logRotateSize: 10
 
-log_backup_count: 7
+logBackupCount: 7
 EOM
 cat <<EOM > /etc/servicecomb-kie/kie-conf.yaml
 db: