校验出错修正

app/install/install_service.py

@@ -194,6 +194,6 @@ class InstallService(HSBaseUCService):
         '''
         out, err = ssh.exec_command('docker -v')
 
-        if 'Docker version' in out or err:
+        if 'Docker version' in out or 'Docker version' in err:
             logger.info('docker安装失败')
             raise HSException('远端服务器已经安装docker，不需要重新安装')

app/upgrade/upgrade_service.py

@@ -503,7 +503,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
         '''
         out, err = ssh.exec_command('docker -v')
 
-        if 'Docker version' not in out or err:
+        if 'Docker version' not in out or 'Docker version' not in err:
             logger.info('验证远端服务器是否安装docker日志:{}'.format(err))
             logger.info('远程升级失败')
             raise HSException('远端服务器未安装docker，请先安装后再升级')