From 82bb4642f800dec8116747f0e886a939706f1a2b Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 3 Apr 2018 15:43:35 +0200
Subject: [PATCH] add parameters to use an HTTP(S) proxy

---
 docker/README.md |  7 +++++++
 docker/run.sh    | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 419dd0798..6e66dafa6 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -63,3 +63,10 @@ To use this image, you need a running instance of PostgreSQL and to configure th
 
 * CONTEXT_PATH:  context path appended to all services running in this container. Default to "/services".
 * SESSION_TIMEOUT: Timeout in milliseconds for session expiration. Default to 2592000.
+
+### PROXY
+
+* HTTP_PROXY_HOST: HTTP proxy host
+* HTTP_PROXY_PORT: HTTP proxy port
+* HTTPS_PROXY_HOST: HTTPS proxy host
+* HTTPS_PROXY_PORT: HTTPS proxy port
diff --git a/docker/run.sh b/docker/run.sh
index 164e59faa..36a069dc7 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -10,4 +10,16 @@ fi
 if [ ! -z "$FEATURES_DB_SERVER" ]; then
   OPTS="$OPTS -wait tcp://$FEATURES_DB_SERVER -timeout 60s"
 fi
+if [ ! -z "$HTTP_PROXY_HOST" ]; then
+  JAVA_OPTIONS="$JAVA_OPTIONS -Dhttp.proxyHost=$HTTP_PROXY_HOST"
+fi
+if [ ! -z "$HTTP_PROXY_PORT" ]; then
+  JAVA_OPTIONS="$JAVA_OPTIONS -Dhttp.proxyPort=$HTTP_PROXY_PORT"
+fi
+if [ ! -z "$HTTPS_PROXY_HOST" ]; then
+  JAVA_OPTIONS="$JAVA_OPTIONS -Dhttps.proxyHost=$HTTPS_PROXY_HOST"
+fi
+if [ ! -z "$HTTPS_PROXY_PORT" ]; then
+  JAVA_OPTIONS="$JAVA_OPTIONS -Dhttps.proxyPort=$HTTPS_PROXY_PORT"
+fi
 dockerize $OPTS java ${JAVA_OPTIONS} -jar /usr/share/jars/portal-backend.jar
-- 
GitLab