beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

admin

Browse source
This commit is contained in:
qiaofeng1227 2023-05-19 17:09:42 +08:00
parent 65faac42b4
commit 878e4f7181
2 changed files with 4 additions and 3 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

5
appmanage/api/service/manage.py
View file

@ -331,7 +331,6 @@ def get_apps_from_compose():
if status == "running" or status == "exited" or status == "restarting":
myLogger.info_logger("ok")
if status == "exited":
cmd = "docker ps -a -f name=" + customer_name + " --format {{.Names}}#{{.Status}}|grep Exited"
result = shell_execute.execute_command_output_all(cmd)["result"].rstrip('\n')
container = result.split("#Exited")[0]
@ -356,7 +355,7 @@ def get_apps_from_compose():
try:
domain = env_map.get("APP_URL")
if "appname.example.com" in domain or ip in domain:
default_domain = ""
default_domain = None
else:
default_domain = domain
except IndexError:
@ -553,6 +552,8 @@ def get_url(app_name, easy_url):
return url
def get_admin_url(customer_name, url):
myLogger.info_logger("get_admin_url")
myLogger.info_logger(url)
admin_url = ""
path = "/data/apps/" + customer_name + "/.env"
try: