qiaofeng1227 2 년 전
부모
커밋
dcdb08b2be
2개의 변경된 파일2개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      appmanage/Dockerfile
  2. 1 8
      appmanage/api/service/manage.py

+ 1 - 1
appmanage/Dockerfile

@@ -10,7 +10,7 @@ COPY static ./static
 COPY requirements.txt main.py  ./
 COPY requirements.txt main.py  ./
 RUN apt update
 RUN apt update
 
 
-# Install supervisord
+# Install supervisords
 RUN apt install -y supervisor
 RUN apt install -y supervisor
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/cmd.sh /cmd.sh
 COPY config/cmd.sh /cmd.sh

+ 1 - 8
appmanage/api/service/manage.py

@@ -27,13 +27,6 @@ redis_conn = Redis(host='websoft9-redis', port=6379)
 # 使用指定的 Redis 连接创建 RQ 队列
 # 使用指定的 Redis 连接创建 RQ 队列
 q = Queue(connection=redis_conn,default_timeout=3600)
 q = Queue(connection=redis_conn,default_timeout=3600)
 
 
-def AppList():
-    myLogger.info_logger("Install app ...")
-    ret = {}
-    ret['ResponseData'] = {}
-    app_id = app_name + "_" + customer_name
-    ret['ResponseData'] = get_my_app()
-
 # 获取所有app的信息
 # 获取所有app的信息
 def get_my_app(app_id):
 def get_my_app(app_id):
     installed_list = get_apps_from_compose()
     installed_list = get_apps_from_compose()
@@ -278,7 +271,7 @@ def get_apps_from_compose():
         password = ""
         password = ""
         official_app = False
         official_app = False
 
 
-        if customer_name in ['appmanage', 'nginxproxymanager','redis'] and app_path == '/data/apps/stackhub/docker/' + customer_name:
+        if customer_name in ['w9appmanage', 'w9nginxproxymanager','w9redis'] and app_path == '/data/apps/stackhub/docker/' + customer_name:
             continue
             continue
         # get code
         # get code
         status = app_info["Status"].split("(")[0]
         status = app_info["Status"].split("(")[0]