Merge branch 'master' of http://gitlab.weisanyun.cn:10080/tools/catalogs/guanyun

templates/guanyun/0/docker-compose.yml

@@ -5,7 +5,7 @@
 {{- $guanyunImage:=printf "%s/guanyun:1.0.0" .Values.docker_registry}}
 
 version: '2'
-service:
+services:
 {{- if eq .Values.db_host "db-mysql"}}
   db-mysql:
     image: {{$dbImage}}
@@ -49,9 +49,6 @@ service:
     tty: true
     labels:
       io.rancher.container.pull_image: always
-{{- if (.Values.host_label)}}
-      io.rancher.scheduler.affinity:host_label: ${host_label}
-{{- end}}
   guanyun:
     image: {{$guanyunImage}}
     environment: