diff --git a/upgradeImage/load.sh b/upgradeImage/load.sh new file mode 100644 index 0000000000000000000000000000000000000000..0e1584a3a992e73c118a702311f5bda0637424e7 --- /dev/null +++ b/upgradeImage/load.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +now_time=`date +%Y%m%d_%H%M%S` + +python -u load_handle.py > ${now_time}.log \ No newline at end of file diff --git a/upgradeImage/load_handle.py b/upgradeImage/load_handle.py new file mode 100644 index 0000000000000000000000000000000000000000..25e378e84cb77f3552235d5d3baebead52badf78 --- /dev/null +++ b/upgradeImage/load_handle.py @@ -0,0 +1,45 @@ +# -*- coding:utf-8 -*- + +import os +import re + +if __name__ == '__main__': + with os.popen('ls | grep .tar') as f: + cmd_txt = f.read() + + if not cmd_txt: + raise RuntimeError('请检查文件,tar文件为空') + + app_name_list = cmd_txt.split('\n') + + for app_name in app_name_list: + if not app_name: + continue + print('åŠ è½½é•œåƒ:{}'.format(app_name[:-4].replace('___', "/").replace("__", ":"))) + cmd_res = os.system('docker load -i {}'.format(app_name)) + if cmd_res == 1: + raise RuntimeError('åŠ è½½å¤±è´¥') + + print('镜åƒåŠ è½½å®Œæ¯•') + print('开始å‡çº§ç¨‹åº') + with open('docker-compose.yml', 'r') as f: + compose_content = f.read() + + app_list_str = re.findall('# app_list: ".*"', compose_content) + if app_list_str: + app_list_str = app_list_str[0] + else: + raise RuntimeError('未设置app_list') + + app_str = app_list_str[len('# app_list: "'):-1] + + if app_str == '*': + res = os.system('''export HUANSI_REGISTRY_URL=47.110.145.204:8084 &&\ +source /etc/profile.d/huansi.sh &&\ +docker-compose up -d --force-recreate''') + else: + res = os.system('''export HUANSI_REGISTRY_URL=47.110.145.204:8084 &&\ +source /etc/profile.d/huansi.sh &&\ +docker-compose up -d --force-recreate --no-deps {}'''.format(app_str)) + + if res == 1: raise RuntimeError('程åºå‡çº§å¤±è´¥') diff --git a/upgradeImage/upgrade_handle.py b/upgradeImage/upgrade_handle.py index 2374db1e1902d53265df53fde5fcd28eabdcb3c9..649062c4f783d31dc3b01eb24a7a8ee43fa8e981 100644 --- a/upgradeImage/upgrade_handle.py +++ b/upgradeImage/upgrade_handle.py @@ -14,11 +14,16 @@ if __name__ == "__main__": log.info('开始打包镜åƒ') image_instance.save_images() log.info('å¤åˆ¶docker-compose.yml文件到/data/upgrade下') - ShellManage().exec_shell('cp -f ./docker-compose.yml /data/upgrade/docker-compose.yml') - ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/analysis_file_to_hsright.py /data/upgrade/docker-compose.yml/analysis_file_to_hsright.py') - ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/analysis_file_to_nginx.py /data/upgrade/docker-compose.yml/analysis_file_to_nginx.py') - ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/base_util.py /data/upgrade/docker-compose.yml/base_util.py') - ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/app.conf /data/upgrade/docker-compose.yml/app.conf') + ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/docker-compose.yml /data/upgrade/docker-compose.yml') + ShellManage().exec_shell( + 'cp -f /huansi/gitlab-runner/builds/analysis_file_to_hsright.py /data/upgrade/analysis_file_to_hsright.py') + ShellManage().exec_shell( + 'cp -f /huansi/gitlab-runner/builds/analysis_file_to_nginx.py /data/upgrade/analysis_file_to_nginx.py') + ShellManage().exec_shell( + 'cp -f /huansi/gitlab-runner/builds/base_util.py /data/upgrade/base_util.py') + ShellManage().exec_shell('cp -f /huansi/gitlab-runner/builds/app.conf /data/upgrade/app.conf') + ShellManage().exec_shell('cp -f ./load_handle.py /data/upgrade/load_handle.py') + ShellManage().exec_shell('cp -f ./load.sh /data/upgrade/load.sh') log.info('*********************************打包结æŸ*********************************') # log.info('å¼€å§‹ä¸Šä¼ é•œåƒå’Œè„šæœ¬æ–‡ä»¶') # ssh = SSHConnection(host='localhost', port=1111, username='root', pwd='huansi.net')