github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-01-24 10:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

app_id error

Browse Source
This commit is contained in:
qiaofeng1227 2023-05-18 14:17:32 +08:00
parent 0585e3bbb3
commit 1f09830960
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appmanage/Dockerfile
View File

@ -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

6
appmanage/api/service/manage.py
View File

@ -284,10 +284,10 @@ def get_apps_from_compose():
app_list = [] app_list = []
for app_info in output_list: for app_info in output_list:
volume = app_info["ConfigFiles"] # volume volume = app_info["ConfigFiles"]
app_path = volume.rsplit('/', 1)[0] app_path = volume.rsplit('/', 1)[0]
customer_name = volume.split('/')[-2] customer_name = volume.split('/')[-2]
app_id = "" # app_id app_id = ""
app_name = "" app_name = ""
trade_mark = "" trade_mark = ""
port = 0 port = 0
@ -382,7 +382,7 @@ def get_apps_from_compose():
status_reason = StatusReason(Code=const.ERROR_SERVER_SYSTEM, Message="system original error", Detail="unknown error") status_reason = StatusReason(Code=const.ERROR_SERVER_SYSTEM, Message="system original error", Detail="unknown error")
else: else:
status_reason = None status_reason = None
app = App(app_id=id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark, app = App(app_id=app_id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark,
app_version=app_version,create_time=create_time,volume_data=volume_data,config_path=config_path, app_version=app_version,create_time=create_time,volume_data=volume_data,config_path=config_path,
status=status, status_reason=status_reason, official_app=official_app, image_url=image_url, status=status, status_reason=status_reason, official_app=official_app, image_url=image_url,
app_https=app_https,app_replace_url=app_https,config=config) app_https=app_https,app_replace_url=app_https,config=config)