From fae072e1952b696225bda8de40532d34b5bc8a53 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Wed, 31 Jul 2024 11:35:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E4=BA=A7=E5=93=81=E5=BA=93Dock?=
 =?UTF-8?q?er=E5=88=B6=E5=93=81=E7=A7=BB=E5=85=A5=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新Docker镜像拉取的python脚本：
1. 新增镜像文件输出目录和输出镜像文件名称两个参数
2. 由于在执行拉取镜像脚本时需要构建临时工作目录，通过输出目录参数将临时工作目录输出到指定文件夹，防止数据冲突
---
 .../src/main/resources/scripts/docker_pull.py         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/scripts/docker_pull.py b/microservices-modules/microservices-modules-pms/src/main/resources/scripts/docker_pull.py
index 0a9445c66..0fb65d2fd 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/scripts/docker_pull.py
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/scripts/docker_pull.py
@@ -10,15 +10,16 @@ import tarfile
 import urllib3
 urllib3.disable_warnings()
 
-if len(sys.argv) != 3 :
-	print('Usage:\n\tdocker_pull.py [registry/][repository/]image[:tag|@digest] [outImgFilePath]\n')
+if len(sys.argv) != 4 :
+	print('Usage:\n\tdocker_pull.py [registry/][repository/]image[:tag|@digest] [outDirPath] [outImgFileName]\n')
 	exit(1)
 
 # Look for the Docker image to download
 repo = 'library'
 tag = 'latest'
 imgparts = sys.argv[1].split('/')
-outImgFilePath=sys.argv[2]
+outDirPath=sys.argv[2]
+outImgFileName=sys.argv[3]
 try:
     img,tag = imgparts[-1].split('@')
 except ValueError:
@@ -88,7 +89,7 @@ if (resp.status_code != 200):
 layers = resp.json()['layers']
 
 # Create tmp folder that will hold the image
-imgdir = 'tmp_{}_{}'.format(img, tag.replace(':', '@'))
+imgdir = outDirPath+os.sep+'tmp_{}_{}'.format(img, tag.replace(':', '@'))
 os.mkdir(imgdir)
 print('Creating image structure in: ' + imgdir)
 
@@ -195,7 +196,7 @@ file.write(json.dumps(content))
 file.close()
 
 # Create image tar and clean tmp folder
-docker_tar = outImgFilePath
+docker_tar = outDirPath+os.sep+outImgFileName
 sys.stdout.write("Creating archive...")
 sys.stdout.flush()
 tar = tarfile.open(docker_tar, "w")