浏览代码

add domain when APP_URL not in .env

qiaofeng1227 2 年之前
父节点
当前提交
e4db71ec60
共有 2 个文件被更改,包括 8 次插入1 次删除
  1. 1 1
      appmanage/Dockerfile
  2. 7 0
      appmanage/api/service/manage.py

+ 1 - 1
appmanage/Dockerfile

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

+ 7 - 0
appmanage/api/service/manage.py

@@ -1050,6 +1050,13 @@ def set_domain(domain, app_id):
             if "APP_URL_REPLACE=true" in app_url:
                 myLogger.info_logger("need up")
                 shell_execute.execute_command_output_all("cd /data/apps/" + customer_name + " && docker compose up -d")
+    else:
+        myLogger.info_logger("APP_URL is not exist")
+        if domain == "":
+            ip_result = shell_execute.execute_command_output_all("cat /data/apps/stackhub/docker/w9appmanage/public_ip")
+            domain = ip_result["result"].rstrip('\n')           
+        cmd = "echo APP_URL=" + domain + " >> /data/apps/" + customer_name +"/.env"
+        shell_execute.execute_command_output_all(cmd)
     myLogger.info_logger("set_domain success")
     
 def get_container_port(container_name):