From b44719ec76fb9edbd2c9dfafbab1e881305a6c43 Mon Sep 17 00:00:00 2001
From: Niklas Reimer <n.reimer@uni-luebeck.de>
Date: Mon, 29 Jan 2024 14:31:07 +0100
Subject: [PATCH] add noproxy_hosts

---
 .env.example         | 2 ++
 compose-dev.yml      | 3 ++-
 compose-research.yml | 3 ++-
 compose.yml          | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 7144725..7f7cfdd 100644
--- a/.env.example
+++ b/.env.example
@@ -47,6 +47,8 @@ AUTHENTICATE=false # either false or oauth2
 # Proxy settings, if required
 #HTTPS_PROXY_HOST=
 #HTTPS_PROXY_PORT=
+# You'll probably need to add you Keycloak here, if you still get certificate chain validation errors 
+#NOPROXY_HOSTS=
 
 #Annotation configuration
 ENABLE_CIVIC=false # CIVIC is currently broken
diff --git a/compose-dev.yml b/compose-dev.yml
index e91ca5a..f0a31c4 100644
--- a/compose-dev.yml
+++ b/compose-dev.yml
@@ -9,7 +9,7 @@ services:
     container_name: cbioportal_container
     environment:
       HTTP_PROXY: "http://${HTTPS_PROXY_HOST}:${HTTPS_PROXY_PORT}"
-      NO_PROXY: "cbioportal,cbioportal_session"
+      NO_PROXY: "cbioportal"
       SHOW_DEBUG_INFO: "true"
     volumes:
      - ./study:/study/:z
@@ -43,6 +43,7 @@ services:
       "-Dfilter_groups_by_appname=false",
       "-Dhttps.proxyHost=${HTTPS_PROXY_HOST}",
       "-Dhttps.proxyPort=${HTTPS_PROXY_PORT}",
+      "-Dhttp.nonProxyHosts=cbioportal-session,${NOPROXY_HOSTS:-}",
       "-Dfrontend.config=/cbioportal/frontend.json",
       "-Dskin.right_logo=${LOGO:-pm4onco.png}",
       "-Dspring.config.location=cbioportal/application.properties",
diff --git a/compose-research.yml b/compose-research.yml
index d7ab3f0..aa96236 100644
--- a/compose-research.yml
+++ b/compose-research.yml
@@ -7,7 +7,7 @@ services:
     container_name: cbioportal_container
     environment:
       HTTP_PROXY: "http://${HTTPS_PROXY_HOST}:${HTTPS_PROXY_PORT}"
-      NO_PROXY: "cbioportal,cbioportal_session"
+      NO_PROXY: "cbioportal"
     volumes:
      - ./study:/study/:z
      - ./config/application.properties:/cbioportal/application.properties:Z
@@ -34,6 +34,7 @@ services:
       "-Dfilter_groups_by_appname=false",
       "-Dhttps.proxyHost=${HTTPS_PROXY_HOST}",
       "-Dhttps.proxyPort=${HTTPS_PROXY_PORT}",
+      "-Dhttp.nonProxyHosts=cbioportal-session,${NOPROXY_HOSTS:-}",
       "-Dskin.right_logo=${LOGO:-pm4onco.png}",
       "-Dspring.config.location=cbioportal/application.properties",
       "-Dauthenticate=${AUTHENTICATE:-false}",
diff --git a/compose.yml b/compose.yml
index 4078903..235ed34 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ services:
     container_name: cbioportal_container
     environment:
       HTTP_PROXY: "http://${HTTPS_PROXY_HOST}:${HTTPS_PROXY_PORT}"
-      NO_PROXY: "cbioportal,cbioportal_session"
+      NO_PROXY: "cbioportal"
     volumes:
      - ./study:/study/:z
      - ./config/application.properties:/cbioportal/application.properties:Z
@@ -35,6 +35,7 @@ services:
       "-Dfilter_groups_by_appname=false",
       "-Dhttps.proxyHost=${HTTPS_PROXY_HOST}",
       "-Dhttps.proxyPort=${HTTPS_PROXY_PORT}",
+      "-Dhttp.nonProxyHosts=cbioportal-session,${NOPROXY_HOSTS:-}",
       "-Dfrontend.config=/cbioportal/frontend.json",
       "-Dskin.right_logo=${LOGO:-pm4onco.png}",
       "-Dspring.config.location=cbioportal/application.properties",