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

add domain when APP_URL not in .env

Browse source
This commit is contained in:
qiaofeng1227 2023-05-23 13:45:28 +08:00
parent 4b4798d293
commit e4db71ec60
2 changed files with 8 additions and 1 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 ./ COPY requirements.txt main.py ./
RUN apt update RUN apt update
# Install supervisord # Install supervisords
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

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

@ -1050,6 +1050,13 @@ def set_domain(domain, app_id):
if "APP_URL_REPLACE=true" in app_url: if "APP_URL_REPLACE=true" in app_url:
myLogger.info_logger("need up") myLogger.info_logger("need up")
shell_execute.execute_command_output_all("cd /data/apps/" + customer_name + " && docker compose up -d") 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") myLogger.info_logger("set_domain success")
def get_container_port(container_name): def get_container_port(container_name):