nomad
/
common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HTTPS_PROXY handling

This commit is contained in:
Daniel Berteaud 2024-03-22 10:31:53 +01:00
parent c07c7dedfe
commit a78d1c6676
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
images/java/root/entrypoint.d/30-java.env
View File

@ -106,12 +106,12 @@ if [ -n "${HTTP_PROXY}" ]; then
fi
# Same for HTTPS_PROXY
if [ -n "${HTTPS_PROXY}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyHost=$(echo ${HTTPS_PROXY} | sed -E 's|.+://([^/:]+).*|\1|')"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyPort=$(echo ${HTTPS_PROXY} | sed -E 's|.+://[^/]+:([0-9]+).*|\1|')"
USER=$(parse_url "${HTTP_PROXY}" "user")
PASSWORD=$(parse_url "${HTTP_PROXY}" "password")
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyHost=$(parse_url "${HTTPS_PROXY}" "host")"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyPort=$(parse_url "${HTTPS_PROXY}" "port")"
USER=$(parse_url "${HTTPS_PROXY}" "user")
PASSWORD=$(parse_url "${HTTPS_PROXY}" "password")
if [ -n "${USER}" -a -n "${PASSWORD}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Dhttp.proxyUser=${USER} -Dhttp.proxyPassword='${PASSWORD}'"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyUser=${USER} -Dhttps.proxyPassword='${PASSWORD}'"
fi
fi
# For NO_PROXY, we need to replace , with |