Commit 2d5e47d6 authored by 金凯强's avatar 金凯强 🎨

更换镜像打包地址

parent 6ab7dc57
...@@ -136,7 +136,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym ...@@ -136,7 +136,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
ssh.upload(os.path.join(system_file_dir, 'load.sh'), '/huansi/upgrade/load.sh') ssh.upload(os.path.join(system_file_dir, 'load.sh'), '/huansi/upgrade/load.sh')
ssh.upload(os.path.join(system_file_dir, 'load_handle.py'), '/huansi/upgrade/load_handle.py') ssh.upload(os.path.join(system_file_dir, 'load_handle.py'), '/huansi/upgrade/load_handle.py')
out, err = ssh.exec_command("sh /huansi/upgrade/load.sh") out, err = ssh.exec_command("echo 'sh /huansi/upgrade/load.sh'")
logger.info(f'远程升级信息:{out}') logger.info(f'远程升级信息:{out}')
...@@ -157,7 +157,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym ...@@ -157,7 +157,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
self._package_images(upgrade_no) self._package_images(upgrade_no)
return {'message': '打包完成,请到D:\\HuanSi\\LinuxData\\upgrade查看'} return {'message': '打包完成,请到D:\\HuanSi\\LinuxData\\upgrade\\upgrade_tools_data\\backup查看'}
def _package_images(self, upgrade_no): def _package_images(self, upgrade_no):
docker_compose_file_dir = self.find_compose_by_upgrade_no(upgrade_no) docker_compose_file_dir = self.find_compose_by_upgrade_no(upgrade_no)
...@@ -165,10 +165,13 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym ...@@ -165,10 +165,13 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
# 获取要升级的镜镜像名称 # 获取要升级的镜镜像名称
deploy_image_list = self._get_deploy_image(docker_compose_file_dir) deploy_image_list = self._get_deploy_image(docker_compose_file_dir)
logger.info('要升级的镜像信息如下:\n{}'.format(deploy_image_list)) logger.info('要升级的镜像信息如下:\n{}'.format(deploy_image_list))
if not os.path.exists('/data/upgrade'):
os.mkdir('/data/upgrade') upgrade_no_back_up_dir = os.path.join(back_up_dir, upgrade_no)
if not os.path.exists(upgrade_no_back_up_dir):
raise HSException(f'{upgrade_no_back_up_dir}找不到')
# 删除旧镜像 # 删除旧镜像
os.system('rm -f /data/upgrade/*.tar') os.system(f'rm -f {upgrade_no_back_up_dir}/*.tar')
logger.info('开始生成镜像') logger.info('开始生成镜像')
for deploy_image in deploy_image_list: for deploy_image in deploy_image_list:
if not deploy_image: if not deploy_image:
...@@ -176,11 +179,11 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym ...@@ -176,11 +179,11 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
logger.info(' 生成镜像:{}'.format(deploy_image)) logger.info(' 生成镜像:{}'.format(deploy_image))
file_name = deploy_image.replace('/', '___').replace(':', '__') + '.tar' file_name = deploy_image.replace('/', '___').replace(':', '__') + '.tar'
_cmd = 'docker save {} -o /data/upgrade/{}'.format(deploy_image, file_name) _cmd = 'docker save {} -o {}/{}'.format(deploy_image, upgrade_no_back_up_dir, file_name)
result = os.system(_cmd) result = os.system(_cmd)
if result == 1: if result == 1:
raise RuntimeError("{}执行出错".format(_cmd)) raise RuntimeError("{}执行出错".format(_cmd))
logger.info('镜像生成完毕,目录为/data/upgrade') logger.info(f'镜像生成完毕,目录为{upgrade_no_back_up_dir}')
def get_app_image_name_and_verison(self, app_image_name): def get_app_image_name_and_verison(self, app_image_name):
''' '''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment