diff --git a/apphub/src/config/config.ini b/apphub/src/config/config.ini index 1d8e4039..bada441a 100644 --- a/apphub/src/config/config.ini +++ b/apphub/src/config/config.ini @@ -1,7 +1,7 @@ [nginx_proxy_manager] base_url = http://websoft9-proxy:81/api user_name = admin@mydomain.com -user_pwd = 9KCRwcL10saLCGaZ +user_pwd = LMFuCnajkQhK3zeb nike_name = admin listen_port = 443 @@ -9,18 +9,18 @@ listen_port = 443 base_url = http://websoft9-git:3000/api/v1 user_name = websoft9 user_email = admin@mydomain.com -user_pwd = kk95qed0Fxt8 +user_pwd = 93HDu6tUWeGx [portainer] base_url = http://websoft9-deployment:9000/api user_name = admin -user_pwd = FptfbwA1TpUr +user_pwd = 93sX)LLHKJY$ [api_key] key = cc9223b3055471a6f4f9654e08371816a9637ba1c57383617b0684b92ac7b2f4 [domain] -wildcard_domain = +wildcard_domain = [cockpit] port = 9000 diff --git a/apphub/src/services/app_manager.py b/apphub/src/services/app_manager.py index efee2724..9cf8f5f1 100644 --- a/apphub/src/services/app_manager.py +++ b/apphub/src/services/app_manager.py @@ -429,15 +429,17 @@ class AppManger: # Verify the app is web app is_web_app = envHelper.get_value("W9_URL") - url_with_port = envHelper.get_value("W9_URL_WITH_PORT") + # url_with_port = envHelper.get_value("W9_URL_WITH_PORT") + w9_url_with_replace = envHelper.get_value("W9_URL_REPLACE") if is_web_app is not None: - if url_with_port is None: + if w9_url_with_replace is None: envHelper.set_value("W9_URL", domain_names[0]) else: try: ipaddress.ip_address(domain_names[0]) - envHelper.set_value("W9_URL", domain_names[0] + ":" + envHelper.get_value("W9_HTTP_PORT_SET")) + #envHelper.set_value("W9_URL", domain_names[0] + ":" + envHelper.get_value("W9_HTTP_PORT_SET")) + envHelper.set_value("W9_URL", domain_names[0] + ":" + (envHelper.get_value("W9_HTTP_PORT_SET") or envHelper.get_value("W9_HTTPS_PORT_SET"))) except ValueError: envHelper.set_value("W9_URL", domain_names[0]) @@ -1100,7 +1102,7 @@ class AppManger: # Get the w9_url and w9_url_replace w9_url_replace = next((element.get("w9_url_replace") for element in app_info.domain_names if element.get("id") == proxy_id), None) w9_url = next((element.get("w9_url") for element in app_info.domain_names if element.get("id") == proxy_id), None) - + # validate w9_url_replace is true if w9_url_replace: domain_names = host.get("domain_names",None) @@ -1111,7 +1113,8 @@ class AppManger: if w9_url in domain_names: new_w9_url = None if len(app_proxys) == 1 and app_proxys[0].get("id") == proxy_id: - new_w9_url = client_host + # 如果w9_url_with_port存在,并且值为: true + new_w9_url = client_host+":"+ (app_info.env.get("W9_HTTP_PORT_SET") or app_info.env.get("W9_HTTPS_PORT_SET")) elif len(app_proxys) > 1: # Get the first proxy_host proxy_host = next((proxy for proxy in app_proxys if proxy.get("id") != proxy_id), None) diff --git a/docker/.env b/docker/.env index 045f86fe..08725504 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -APPHUB_VERSION=0.1.8 +APPHUB_VERSION=0.1.9-rc DEPLOYMENT_VERSION=2.20.3 GIT_VERSION=1.21.9 -PROXY_VERSION=2.11.3 \ No newline at end of file +PROXY_VERSION=2.11.3 diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index d8a5df9e..1b1c2048 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -1,11 +1,11 @@ # This file can running at actions # MEDIA_VERSION and LIBRARY_VERSION will trigger its release -# modify time: 202412301518, you can modify here to trigger Docker Build action +# modify time: 202501011018, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye LABEL maintainer="Websoft9" -LABEL version="0.1.9-dev" +LABEL version="0.1.9-rc" WORKDIR /websoft9 diff --git a/version.json b/version.json index 548958e8..d4af4485 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "2.1.19", + "version": "2.1.20-rc1", "plugins": { "portainer": "0.1.3", "nginx": "0.1.0",