test_docker_compose_blockchain_integral

templates/blockchain/62/docker-compose.yml

@@ -8,6 +8,7 @@
 {{- $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:2.0.10.7" }}
+{{- $blockchainintegralImage:=printf "registry.cn-shenzhen.aliyuncs.com/wsy_dev/blockchain_integral:1.0.0.17" }}
 
 version: '2'
 services:
@@ -72,7 +73,7 @@ services:
     - TBAAS_TYPE=${tbaas_type}
     stdin_open: true
     volumes:
-    - bc-resources:/var/www/html/resources
+    - bc-resources:/var/www/html/
     tty: true
     logging:
       driver: json-file
@@ -226,7 +227,39 @@ services:
     labels:
       io.rancher.container.pull_image: always
       io.rancher.container.start_once: true
-
+  {{- if ne .Values.blockchain_integral_enable "false"}}
+  blockchain-integral:
+  {{- if eq .Values.blockchain_integral_enable "true"}}
+    image: {{$blockchainintegralImage}}
+  {{- else}}
+    image: ${blockchain_integral_enable}
+  {{- end}}
+    environment:
+      APP_INTRANET_DOMAIN: http://blockchain-integral
+      DB_HOST_BLOCKCHAIN_INTEGRAL: ${db_host}
+      DB_PORT_BLOCKCHAIN_INTEGRAL: ${db_port}
+      DB_PWD_BLOCKCHAIN_INTEGRAL: ${db_pwd}
+      DB_USER_BLOCKCHAIN_INTEGRAL: ${db_user}
+      WSY_BLOCKCHAIN_INTEGRAL: new_blockchain_integral
+    {{ template "base_env" .}}
+    stdin_open: true
+    volumes:
+    - resources:/var/www/html/resources
+    - /tmp/wsy
+    tty: true
+    labels:
+      traefik.frontend.rule: 'Host:${host_url}; PathPrefix:/blockchain_integral/'
+      traefik.port: 80
+      traefik.enable: true
+      io.rancher.container.pull_image: always
+      aliyun.logs.blockchain-integral: stdout
+      aliyun.logs.blockchain-integral.tags: logtype=apache
+      aliyun.logs.wsylog: /tmp/wsy/*/*.log
+      aliyun.logs.wsylog.format: json
+{{- if (.Values.host_label)}}
+      io.rancher.scheduler.affinity:host_label: ${host_label}
+{{- end}}
+{{- end}}
 volumes:
   bc-resources:
     driver: ${volume_driver}

templates/blockchain/62/rancher-compose.yml

@@ -219,6 +219,13 @@ catalog:
       options:
         - registry.cn-hangzhou.aliyuncs.com/weisanyun
         - reg.wsy010.cn/blockchain
+    - variable: "blockchain_integral_enable"
+      description: | 
+        选择true/false 以 启用/禁用 商城服务.
+      label: "是否开启【blockchain_integral】服务:"
+      required: true
+      default: false 
+      type: "string"
 services:
   bc-task:
     scale: 1