11

templates/blockchain/40/README.md

@@ -43,4 +43,6 @@ v2.2.9_20200923
 - **v2.2.0版本注意事项**
   + 注意事项：共享链客户不允许创建子母链和同链模式的SaaS子账号，只能创建baas配置的SaaS子账号
 - **v2.2.6版本注意事项**
-  + 新增数据库自动导入容器
\ No newline at end of file
+  + 新增数据库自动导入容器
+- **v2.2.9版本注意事项**
+  + 需要填入rancher信息和选择对应环境 默认为Default
\ No newline at end of file

templates/blockchain/40/docker-compose.yml

@@ -7,7 +7,7 @@
 {{- $mqCImage:=printf "%s/mq-client:1.0.4_20200529" .Values.docker_registry}}
 {{- $websiteImage:=printf "%s/website:1.0.2_20200117" .Values.docker_registry}}
 {{- $sphinxImage:=printf "%s/coreseek:4.1_blockchain2.0" .Values.docker_registry}}
-{{- $dbupdateImage:=printf "registry.cn-shenzhen.aliyuncs.com/wsy_dev/db_update:1.0.5" }}
+{{- $dbupdateImage:=printf "registry.cn-shenzhen.aliyuncs.com/wsy_dev/db_update:2.0.0" }}
 
 version: '2'
 services:
@@ -212,10 +212,13 @@ services:
     - DB_PORT=3306
     - SYSTEM=block
     - STACK_NAME={{ .Stack.Name }}
+    - RANCHER_URL=${rancher_url}
+    - RANCHER_ACCESS_KEY=${rancher_access_key}
+    - RANCHER_SECRET_KEY=${rancher_secret_key}
+    - RANCHER_ENVIRONMENT=${rancher_env}
     volumes:
-    - /var/run/docker.sock:/var/run/docker.sock:ro
+    - /tmp/db_update:/opt/db-update
     stdin_open: true
-    tty: true
     labels:
       io.rancher.container.pull_image: always
       io.rancher.container.start_once: true

templates/blockchain/40/rancher-compose.yml

@@ -92,6 +92,30 @@ catalog:
       options:
         - http://bc-sdk:8080/blockchain/
         - http://bc-sdk:8080/tbaas/
+    - variable: rancher_url
+      description: "Rancher_Url"
+      label: "Rancher_Url"
+      required: true
+      default: ""
+      type: "string"
+    - variable: rancher_access_key
+      description: "Rancher_Access_key"
+      label: "Rancher_Access_key"
+      required: true
+      default: ""
+      type: "string"
+    - variable: rancher_secret_key
+      description: "Rancher_Secret_key"
+      label: "Rancher_Secret_key"
+      required: true
+      default: ""
+      type: "string"
+    - variable: rancher_env
+      description: "Stack所属环境 例如Default"
+      label: "Rancher_Env"
+      required: true
+      default: "Default"
+      type: "string"
     - variable: lic_id
       description: "授权id，请向服务商索要"
       label: "授权ID"