github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-02-03 01:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

admin_domain_url add

Browse Source
This commit is contained in:
qiaofeng1227 2023-05-20 16:48:18 +08:00
parent 57ce53e4c3
commit 5dcd544fac
3 changed files with 10 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 ./
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

2
appmanage/api/model/config.py
View File

@ -8,3 +8,5 @@ class Config(BaseModel):
admin_username: str
admin_password: str
default_domain: str
admin_path: str
admin_domain_url: str

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

@ -324,6 +324,8 @@ def get_apps_from_compose():
app_https = False
app_replace_url = False
default_domain = ""
admin_path = ""
admin_domain_url = ""
if customer_name in ['w9appmanage', 'w9nginxproxymanager','w9redis','w9portainer'] and app_path == '/data/apps/stackhub/docker/' + customer_name:
continue
@ -366,7 +368,9 @@ def get_apps_from_compose():
volume_data = "/data/apps/" + customer_name + "/data"
user_name = env_map.get("APP_USER","")
password = env_map.get("POWER_PASSWORD","")
admin_path = env_map.get("APP_ADMIN_PATH")
if default_domain != "" and admin_path:
admin_domain_url = default_domain + admin_path
except IndexError:
pass
try:
@ -407,8 +411,8 @@ def get_apps_from_compose():
app_id = customer_name + "_" + customer_name
create_time = get_createtime(official_app, app_path, customer_name)
if status in ['running', 'exited']:
config = Config(port=port, compose_file=volume, url=url, admin_url=admin_url,
admin_username=user_name, admin_password=password, default_domain=default_domain)
config = Config(port=port, compose_file=volume, url=url, admin_url=admin_url,admin_domain_url=admin_domain_url,
admin_path=admin_path,admin_username=user_name, admin_password=password, default_domain=default_domain)
else:
config = None
if status == "failed":