airship/airshipctl
Code Issues Proposed changes

Fix HTTP_PROXY variable not being set

Browse Source 
In 21_systemwide_executable.sh and 22_test_configs.sh the HTTP_PROXY
variable is not being set while the HTTPS_PROXY variable is being set
twice.

Closes: #318

Change-Id: I84de84b79b76cef3967248f730f022f1b8f34987
This commit is contained in:
Michael Beaver 2020-07-31 16:08:57 -05:00
parent 645aeeb293
commit ec9ebaa3e0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/21_systemwide_executable.sh
View File

@ -16,7 +16,7 @@ set -xe
export USE_PROXY=${USE_PROXY:-"false"}
export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}}
export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}}
export HTTP_PROXY=${HTTP_PROXY:-${http_proxy}}
export NO_PROXY=${NO_PROXY:-${no_proxy}}
echo "Build airshipctl in docker image"

2
tools/deployment/22_test_configs.sh
View File

@ -20,7 +20,7 @@ export AIRSHIPCTL_WS=${AIRSHIPCTL_WS:-$PWD}
export USER_NAME=${USER:-"ubuntu"}
export USE_PROXY=${USE_PROXY:-"false"}
export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}}
export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}}
export HTTP_PROXY=${HTTP_PROXY:-${http_proxy}}
export NO_PROXY=${NO_PROXY:-${no_proxy}}
export AIRSHIP_CONFIG_ISO_GEN_TARGET_PATH=${ISO_DIR}
export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/isogen:latest-debian_stable"}