none

appmanage/Dockerfile

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

appmanage/api/model/app.py

@@ -3,18 +3,18 @@ from api.model.config import Config
 from api.model.status_reason import StatusReason
 
 class App(BaseModel):
-    app_id: str
-    app_name: str
-    customer_name: str
-    trade_mark: str
-    status: str
+    app_id: None
+    app_name: None
+    customer_name: None
+    trade_mark: None
+    status: None
     status_reason: StatusReason = None
     official_app: bool
-    app_version: str
-    create_time: str
+    app_version: None
+    create_time: None
     volume_data = []
-    config_path = str
-    image_url: str
+    config_path = None
+    image_url: None
     app_https: bool
     app_replace_url: bool
     config: Config = None

appmanage/api/model/config.py

@@ -2,9 +2,9 @@ from pydantic import BaseModel
 
 class Config(BaseModel):
     port: int
-    compose_file: str
-    url: str
-    admin_url: str
-    admin_username: str
-    admin_password: str
-    default_domain: str
+    compose_file: None
+    url: None
+    admin_url: None
+    admin_username: None
+    admin_password: None
+    default_domain: None

appmanage/api/service/manage.py

@@ -408,6 +408,7 @@ def get_apps_from_compose():
         if status in ['running', 'exited']:
             myLogger.info_logger("config set ok")
             myLogger.info_logger(default_domain)
+
             config = Config(port=port, compose_file=volume, url=url, admin_url=admin_url,
                                    admin_username=user_name, admin_password=password, default_domain=default_domain)
         else: