From c30322b5d825bf0bd4dff09251d3e7bb089486cf Mon Sep 17 00:00:00 2001 From: pengtao Date: Tue, 15 Jun 2021 18:09:38 +0800 Subject: [PATCH] 1 --- deploy/deploy_git.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy/deploy_git.py b/deploy/deploy_git.py index 3dfde7f..6c31e41 100644 --- a/deploy/deploy_git.py +++ b/deploy/deploy_git.py @@ -51,10 +51,10 @@ class DeployGit: if os.path.isdir('/data/publish/git/'+self.name): shutil.rmtree('/data/publish/git/'+self.name) - build_cmd = "cd /data/publish/git && git clone {url} && cd {name} && sh {pre_script} && cd .. && tar zcvf {tag_name}.tar.gz {name} ".format( + build_cmd = "cd /data/publish/git && git clone {url} && cd {name} && sh {pre_script} && tar zcvf {tag_name}.tar.gz * ".format( name=self.name, url=url, tag_name=self.tag_name, pre_script=pre_script) os.system(build_cmd) - self.tag_file = "/data/publish/git/"+self.tag_name+'.tar.gz' + self.tag_file = "/data/publish/git/"+self.name+'/'+self.tag_name+'.tar.gz' if os.path.isfile(self.tag_file): return True else: @@ -63,8 +63,7 @@ class DeployGit: def _deploy_remote(self): for line in self.infos: if line: - pdb.set_trace() - _,hosts, paths, user, _, _, start_script = line + _, hosts, paths, user, _, _, start_script = line hosts = hosts.split(',') hostfile = self.write_host(hosts) an = AnsibleAPI(hostfile)