update 项目配置

.gitignore

@@ -0,0 +1,4 @@
+.idea
+/venv/
+*/__pycache__/
+

.gitlab-ci.yml

@@ -4,10 +4,10 @@ stages:
 job:
   stage: deploy
   script:
-    - docker stop mail_auth
-    - docker rm mail_auth
+#    - docker stop mail_auth
+#    - docker rm mail_auth
     - docker build -t mail_auth
-    - docker run -d -p 11002:11002 --name mail_auth mail_auth
+    - docker run -d --network apps_network --ip 172.20.50.1 -p 11002:11002 --name mail_auth mail_auth
   only:
     - master
   tags:

config/project_config.py

@@ -1,4 +1,5 @@
-PROJECT_SUBNET = ''
-PROJECT_SUBNET_IP = ''
-PROJECT_PORT = 11002
 PROJECT_NAME = 'mail_auth'
+PROJECT_ID = '50.1'
+PROJECT_NETWORK = 'apps_network'
+PROJECT_INNER_IP = '172.20.{}'.format(PROJECT_ID)
+PROJECT_PORT = '30001'

config_writer.py

@@ -1,4 +1,4 @@
-from config.project_config import PROJECT_NAME, PROJECT_SUBNET, PROJECT_PORT
+from config.project_config import PROJECT_NAME, PROJECT_NETWORK, PROJECT_PORT, PROJECT_INNER_IP
 
 
 # 重写gitlab配置文件
@@ -6,9 +6,9 @@ def write_gitlab_config():
     with open('.gitlab-ci.yml') as f:
         content = f.read()
         content = content.replace('PROJECT_NAME', PROJECT_NAME)
-        content = content.replace('PROJECT_PORT', str(PROJECT_PORT))
-        if PROJECT_SUBNET != '':
-            content = content.replace('PROJECT_SUBNET', PROJECT_SUBNET)
+        content = content.replace('PROJECT_PORT', PROJECT_PORT)
+        content = content.replace('PROJECT_NETWORK', PROJECT_NETWORK)
+        content = content.replace('PROJECT_INNER_IP', PROJECT_INNER_IP)
         f.close()
     with open('.gitlab-ci.yml', 'w') as f:
         f.write(content)

gunicorn.conf.py

@@ -1,6 +1,8 @@
+from config.project_config import PROJECT_PORT
+
 # 并行工作进程数
-workers = 4
-# 监听内网端口10001
-bind = '0.0.0.0:10001'
+workers = 10
+# 监听内网端口
+bind = '0.0.0.0:{}'.format(PROJECT_PORT)
 # 工作模式协程
 worker_class = 'gevent'