qiaofeng1227 2 년 전
부모
커밋
ac13f06229
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      appmanage/Dockerfile
  2. 3 3
      appmanage/api/utils/docker.py

+ 1 - 1
appmanage/Dockerfile

@@ -10,7 +10,7 @@ COPY static ./static
 COPY requirements.txt main.py  ./
 COPY requirements.txt main.py  ./
 RUN apt update
 RUN apt update
 
 
-# Install supervisords
+# Install supervisord
 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

+ 3 - 3
appmanage/api/utils/docker.py

@@ -155,9 +155,9 @@ def check_app_url(customer_app_name):
     myLogger.info_logger("Checking app url...")
     myLogger.info_logger("Checking app url...")
     # 如果app的.env文件中含有HTTP_URL项目,需要如此设置 HTTP_URL=ip:port
     # 如果app的.env文件中含有HTTP_URL项目,需要如此设置 HTTP_URL=ip:port
     env_path = "/data/apps/" + customer_app_name + "/.env"
     env_path = "/data/apps/" + customer_app_name + "/.env"
-    if list(read_env(env_path, "HTTP_URL").values())[0] == "true":
+    if list(read_env(env_path, "APP_URL_REPLACE").values())[0] == "true":
         myLogger.info_logger(customer_app_name + "need to change app url...")
         myLogger.info_logger(customer_app_name + "need to change app url...")
-        app_url = list(read_env(env_path, "HTTP_URL").values())[0]
+        app_url = list(read_env(env_path, "APP_URL").values())[0]
         ip = "localhost"
         ip = "localhost"
         url = ""
         url = ""
         try:
         try:
@@ -171,7 +171,7 @@ def check_app_url(customer_app_name):
             url = ip + ":" + http_port
             url = ip + ":" + http_port
         else:
         else:
             url = ip
             url = ip
-        modify_env(env_path, "HTTP_URL", url)
+        modify_env(env_path, "APP_URL", url)
 
 
     myLogger.info_logger("App url check complete")
     myLogger.info_logger("App url check complete")
     return
     return