samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-17 03:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

reaf: var naming for proxy usage in our bridgehead scripts

Browse Source
This commit is contained in:
Patrick Skowronek
2023-10-10 10:43:22 +02:00
parent 85446b0a3e
commit 68cd62b981
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/functions.sh
View File

@ -3,7 +3,7 @@
detectCompose() {
if [[ "$(docker compose version 2>/dev/null)" == *"Docker Compose version"* ]]; then
COMPOSE="docker compose"
e
else
COMPOSE="docker-compose"
# This is intended to fail on startup in the next prereq check.
fi
@ -12,16 +12,16 @@ detectCompose() {
setupProxy() {
if [[ ! -z "$HTTP_PROXY_USERNAME" && ! -z "$HTTP_PROXY_PASSWORD" ]]; then
log "INFO" "Detected proxy user and password"
PROTO="$(echo $HTTP_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
URL="$(echo ${HTTP_PROXY_URL/$PROTO/})"
PROXY="$(echo $PROTO$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$URL)"
HTTP_PROXY_PROTOCOL="$(echo $HTTP_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
HTTP_PROXY_FQDN="$(echo ${HTTP_PROXY_URL/$HTTP_PROXY_PROTOCOL/})"
HTTP_PROXY_FULL_URL="$(echo $HTTP_PROXY_PROTOCOL$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$HTTP_PROXY_FQDN)"
SECURE_PROTO="$(echo $HTTPS_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
SECURE_URL="$(echo ${HTTPS_PROXY_URL/$SECURE_PROTO/})"
SECURE_PROXY="$(echo $SECURE_PROTO$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$SECURE_URL)"
HTTPS_PROXY_PROTOCOL="$(echo $HTTPS_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
HTTPS_PROXY_FQDN="$(echo ${HTTPS_PROXY_URL/$HTTPS_PROXY_PROTOCOL/})"
HTTPS_PROXY_FULL_URL="$(echo $HTTPS_PROXY_PROTOCOL$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$HTTPS_PROXY_FQDN)"
else
PROXY=$HTTP_PROXY_URL
SECURE_PROXY=$HTTPS_PROXY_URL
HTTP_PROXY_FULL_URL=$HTTP_PROXY_URL
HTTPS_PROXY_FULL_URL=$HTTPS_PROXY_URL
fi
}