marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebuild orborus with correct env

Browse Source
This commit is contained in:
Frikky
2023-12-12 13:23:56 +01:00
parent 2383b1e730
commit daf378e5d6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/app_base.py
+2
View File
@@ -340,6 +340,8 @@ class AppBase:
except Exception as e: 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] 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): if isinstance(self.action, str):
try: try:
self.action = json.loads(self.action) self.action = json.loads(self.action)
functions/onprem/orborus/orborus.go
+2 -2
View File
@@ -1611,12 +1611,12 @@ func main() {
overrideHttpsProxy := os.Getenv("SHUFFLE_INTERNAL_HTTPS_PROXY") overrideHttpsProxy := os.Getenv("SHUFFLE_INTERNAL_HTTPS_PROXY")
if len(overrideHttpProxy) > 0 { if len(overrideHttpProxy) > 0 {
log.Printf("[DEBUG] Added internal proxy: %s", overrideHttpProxy) 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 { if len(overrideHttpsProxy) > 0 {
log.Printf("[DEBUG] Added internal proxy: %s", overrideHttpsProxy) 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) err = deployWorker(workerImage, containerName, env, execution)