Merge branch 'feature/stroage-manage' of xuyiping/kpt-tmr-group into develop

.drone.yml

@@ -6,11 +6,22 @@ clone:
   depth: 1
   disable: true
 
+environment:
+  APP_ENVIRONMENT: test
+  GO_WORK_DIR: /bin/kptTmrGroup
+
 steps:
   - name: clone
     image: alpine/git
     commands:
       - git clone -b develop http://kpt.kptyun.cn:3000/xuyiping/kpt-tmr-group.git
+  - name: test
+    image: alpine/golang
+    commands:
+      - cd /drone/src/kpt-tmr-group
+      - go test `go list ./... | grep -v -E "mock|store|test|fake|cmd|bin|backend|google|logger|proto"` -coverprofile .cover.txt
+      - go tool cover -func .cover.txt
+      - rm .cover.txt
   - name: build
     image: plugins/docker
     volumes:
@@ -28,15 +39,15 @@ steps:
         from_secret: aliyuncs_password
       repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-tmr-group
       registry: registry.cn-hangzhou.aliyuncs.com
-      tags: [ 1.0.0,latest ]
+      tags: [1.0.0,latest]
 
 trigger:
   branch:
-    include:
-    - develop
+   include:
+     - develop
   event:
-    include:
     - push
+    - merge
 
 volumes:
   - name: docker-ca

.drone.yml.bak

@@ -0,0 +1,58 @@
+kind: pipeline
+type: docker
+name: kptTmrGroup
+
+clone:
+  depth: 1
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    commands:
+      - git clone -b develop http://kpt.kptyun.cn:3000/xuyiping/kpt-tmr-group.git
+  - name: build
+    image: plugins/docker
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: dockersock
+        path: /var/run/docker.sock
+    settings:
+      dockerfile: /drone/src/kpt-tmr-group/Dockerfile
+      username:
+        from_secret: aliyuncs_username
+      password:
+        from_secret: aliyuncs_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-tmr-group
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tags: [ 1.0.0,latest ]
+  - name: remove-local-image
+    image: appleboy/drone-ssh
+    settings:
+      host: 192.168.1.70
+      username: tmrwatch
+      password:
+        from_secret: tmrwatch_password
+      port: 22
+      script:
+        - docker rm registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-tmr-group:1.0.0
+
+
+trigger:
+  branch:
+    include:
+    - develop
+  event:
+    include:
+    - push
+
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock

config/load_config.go

@@ -9,8 +9,11 @@ import (
 )
 
 func Initialize(path string, cfgStruct interface{}) error {
-	dir := fmt.Sprintf("%s/config/%s", os.Getenv("GO_WORK_DIR"), path)
-	// dir = fmt.Sprintf("D:\\project\\golangNew\\kpt-tmr-group\\config\\%s", path)
+	workDir := os.Getenv("GO_WORK_DIR")
+	if workDir == "" {
+		workDir = "./"
+	}
+	dir := fmt.Sprintf("%s/config/%s", workDir, path)
 	viper.SetConfigType("yaml")
 	viper.SetConfigFile(dir)
 	if err := viper.ReadInConfig(); err != nil {