diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index 7a4cb109..8b1d2295 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py database.sqlite ./ 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 diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index 55bae3d9..ae2779d0 100644 --- a/appmanage/api/service/manage.py +++ b/appmanage/api/service/manage.py @@ -1,3 +1,4 @@ +from ast import Constant import os import io import sys @@ -791,7 +792,7 @@ def app_proxy_delete(app_id): customer_name = app_id.split('_')[1] proxy_host = None token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts" + url = const.NGINX_URL+"/api/nginx/proxy-hosts" headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -803,7 +804,7 @@ def app_proxy_delete(app_id): if customer_name == portainer_name: proxy_id = proxy["id"] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts/" + str(proxy_id) + url = const.NGINX_URL+"/api/nginx/proxy-hosts/" + str(proxy_id) headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -844,7 +845,7 @@ def app_domain_delete(app_id, domain): if len(domains_old) == 0: proxy_id = proxy["id"] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts/" + str(proxy_id) + url = const.NGINX_URL+"/api/nginx/proxy-hosts/" + str(proxy_id) headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -859,7 +860,7 @@ def app_domain_delete(app_id, domain): else: proxy_id = proxy["id"] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts/" + str(proxy_id) + url = const.NGINX_URL+"/api/nginx/proxy-hosts/" + str(proxy_id) headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -925,7 +926,7 @@ def app_domain_update(app_id, domain_old, domain_new): domains_old[index] = domain_new proxy_id = proxy["id"] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts/" + str(proxy_id) + url = const.NGINX_URL+"/api/nginx/proxy-hosts/" + str(proxy_id) headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -994,7 +995,7 @@ def app_domain_add(app_id, domain): proxy_id = proxy["id"] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts/" + str(proxy_id) + url = const.NGINX_URL+"/api/nginx/proxy-hosts/" + str(proxy_id) headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -1028,7 +1029,7 @@ def app_domain_add(app_id, domain): else: # 追加 token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts" + url = const.NGINX_URL+"/api/nginx/proxy-hosts" headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -1127,7 +1128,7 @@ def get_proxy(app_id): customer_name = app_id.split('_')[1] proxy_host = None token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts" + url = const.NGINX_URL+"/api/nginx/proxy-hosts" headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -1147,7 +1148,7 @@ def get_proxy_domain(app_id, domain): customer_name = app_id.split('_')[1] proxy_host = None token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts" + url = const.NGINX_URL+"/api/nginx/proxy-hosts" headers = { 'Authorization': token, 'Content-Type': 'application/json' @@ -1172,7 +1173,7 @@ def get_all_domains(app_id): customer_name = app_id.split('_')[1] domains = [] token = get_token() - url = "http://172.17.0.1:9092/api/nginx/proxy-hosts" + url = const.NGINX_URL+"/api/nginx/proxy-hosts" headers = { 'Authorization': token, 'Content-Type': 'application/json' diff --git a/appmanage/api/utils/const.py b/appmanage/api/utils/const.py index 24a9f830..dcb1a26a 100644 --- a/appmanage/api/utils/const.py +++ b/appmanage/api/utils/const.py @@ -30,3 +30,5 @@ APP_STATUS_EXITED = "exited" APP_STATUS_RESTARTING = "restarting" # 应用错误 failed APP_STATUS_FAILED = "failed" + +NGINX_URL="http://websoft9-nginxproxymanager:81"