Pārlūkot izejas kodu

update 初始化代码路径

Alenx 6 gadi atpakaļ
vecāks
revīzija
9193d6d07d
3 mainītis faili ar 16 papildinājumiem un 14 dzēšanām
  1. 2 0
      Dockerfile
  2. 0 1
      docker-compose.yml
  3. 14 13
      walle/service/deployer.py

+ 2 - 0
Dockerfile

@@ -6,6 +6,8 @@ ADD ./requirements/prod.txt /usr/app/
 
 RUN pip install -r /usr/app/prod.txt -i https://mirrors.aliyun.com/pypi/simple
 
+VOLUME /root/.ssh/
+
 EXPOSE 5000
 
 CMD ["/bin/bash"]

+ 0 - 1
docker-compose.yml

@@ -22,7 +22,6 @@ services:
     container_name: walle-python
     hostname: walle-python
     volumes:
-      - root/.ssh/:/root/.ssh/
       - $PWD/:/opt/walle-web/
       - /tmp/walle/codebase/:/tmp/walle/codebase/
     environment:

+ 14 - 13
walle/service/deployer.py

@@ -120,9 +120,10 @@ class Deployer:
         # 检查 目录是否存在
         self.init_repo()
 
+        # self.init_repo() 函数中已经操作了
         # TODO to be removed
-        command = 'mkdir -p %s' % (self.dir_codebase_project)
-        result = self.localhost.local(command, wenv=self.config())
+        # command = 'mkdir -p %s' % (self.dir_codebase_project)
+        # result = self.localhost.local(command, wenv=self.config())
 
         # 用户自定义命令
         command = self.project_info['prev_deploy']
@@ -196,20 +197,20 @@ class Deployer:
             with self.localhost.cd(self.local_codebase + self.release_version):
                 result = self.localhost.local(command, wenv=self.config())
 
-        # # 压缩打包
-        # # 排除文件发布
+        # 压缩打包
+        # 排除文件发布
+        self.release_version_tar = '%s.tgz' % (self.release_version)
+        with self.localhost.cd(self.local_codebase):
+            excludes = excludes_format(self.project_info['excludes'])
+            command = 'tar zcf  %s %s %s' % (self.release_version_tar, excludes, self.release_version)
+            result = self.localhost.local(command, wenv=self.config())
+
+        # # 指定文件发布
         # self.release_version_tar = '%s.tgz' % (self.release_version)
         # with self.localhost.cd(self.local_codebase):
-        #     excludes = excludes_format(self.project_info['excludes'])
+        #     excludes = suffix_format(self.dir_codebase_project, self.project_info['excludes'])
         #     command = 'tar zcf  %s %s %s' % (self.release_version_tar, excludes, self.release_version)
-        #     result = self.localhost.local(command, wenv=self.config())
-
-        # 指定文件发布
-        self.release_version_tar = '%s.tgz' % (self.release_version)
-        with self.local.cd(self.local_codebase):
-            excludes = suffix_format(self.dir_codebase_project, self.project_info['excludes'])
-            command = 'tar zcf  %s %s %s' % (self.release_version_tar, excludes, self.release_version)
-            result = self.local.run(command, wenv=self.config())
+        #     result = self.local.run(command, wenv=self.config())
 
     def prev_release(self, waller):
         '''