From dc94c1bed505efaf215199ee06cb0b762e28f626 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Fri, 19 May 2023 16:25:15 +0800
Subject: [PATCH] docker

---
 appmanage/Dockerfile            |  2 +-
 appmanage/api/service/manage.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile
index d6cf741e..ef28a3a5 100644
--- a/appmanage/Dockerfile
+++ b/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
diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py
index d29b482b..0da467ca 100644
--- a/appmanage/api/service/manage.py
+++ b/appmanage/api/service/manage.py
@@ -364,24 +364,24 @@ def get_apps_from_compose():
             try:
                 app_version = env_map.get("APP_VERSION")
                 volume_data = ["/var/lib/docker/volumes"]
-                user_name = env_map.get("APP_USER")
-                password = env_map.get("POWER_PASSWORD")
+                user_name = env_map.get("APP_USER","")
+                password = env_map.get("POWER_PASSWORD","")
 
             except IndexError:
                 pass
             try:
-                replace = env_map.get("APP_URL_REPLACE")
+                replace = env_map.get("APP_URL_REPLACE","false")
                 myLogger.info_logger("replace="+replace)
                 if replace == "true":
                     app_replace_url = True
-                https = env_map.get("APP_HTTPS_ACCESS")
+                https = env_map.get("APP_HTTPS_ACCESS","")
                 if https == "true":
                     app_https = True
             except IndexError:
                 pass
 
             try:
-                http_port = env_map.get("APP_HTTP_PORT")
+                http_port = env_map.get("APP_HTTP_PORT","0")
                 if http_port:
                     port = int(http_port)
             except IndexError: