From daf378e5d62ec69bb2c32e5dff5b58003b08a5ce Mon Sep 17 00:00:00 2001 From: Frikky Date: Tue, 12 Dec 2023 13:23:56 +0100 Subject: [PATCH] Rebuild orborus with correct env --- backend/app_sdk/app_base.py | 2 ++ functions/onprem/orborus/orborus.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index e2a0fcae..0e735176 100755 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -340,6 +340,8 @@ class AppBase: except Exception as e: self.logger.info(f"[DEBUG] Failed setting proxy config: {e}. NOT important if running apps with webserver. This is NOT critical.") + self.logger.info(f"[DEBUG] Proxy config: {self.proxy_config}") + if isinstance(self.action, str): try: self.action = json.loads(self.action) diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index cfa62a9c..99da2cc1 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -1611,12 +1611,12 @@ func main() { overrideHttpsProxy := os.Getenv("SHUFFLE_INTERNAL_HTTPS_PROXY") if len(overrideHttpProxy) > 0 { log.Printf("[DEBUG] Added internal proxy: %s", overrideHttpProxy) - env = append(env, fmt.Sprintf("HTTP_PROXY=%s", overrideHttpProxy)) + env = append(env, fmt.Sprintf("SHUFFLE_INTERNAL_HTTP_PROXY=%s", overrideHttpProxy)) } if len(overrideHttpsProxy) > 0 { log.Printf("[DEBUG] Added internal proxy: %s", overrideHttpsProxy) - env = append(env, fmt.Sprintf("HTTPS_PROXY=%s", overrideHttpsProxy)) + env = append(env, fmt.Sprintf("SHUFFLE_INTERNAL_HTTPS_PROXY=%s", overrideHttpsProxy)) } err = deployWorker(workerImage, containerName, env, execution)