Skip to content

Commit 343c441

Browse files
CopilotBYK
andcommitted
Remove exec_proxy_args and inline proxy flags in dcx
Co-authored-by: BYK <[email protected]>
1 parent 1c9aa8c commit 343c441

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

install/dc-detect-version.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ else
4848
fi
4949

5050
proxy_args="--build-arg HTTP_PROXY=${HTTP_PROXY:-} --build-arg HTTPS_PROXY=${HTTPS_PROXY:-} --build-arg NO_PROXY=${NO_PROXY:-} --build-arg http_proxy=${http_proxy:-} --build-arg https_proxy=${https_proxy:-} --build-arg no_proxy=${no_proxy:-}"
51-
exec_proxy_args="-e HTTP_PROXY=${HTTP_PROXY:-} -e HTTPS_PROXY=${HTTPS_PROXY:-} -e NO_PROXY=${NO_PROXY:-} -e http_proxy=${http_proxy:-} -e https_proxy=${https_proxy:-} -e no_proxy=${no_proxy:-}"
5251
if [[ "$CONTAINER_ENGINE" == "podman" ]]; then
5352
proxy_args_dc="--podman-build-args HTTP_PROXY=${HTTP_PROXY:-},HTTPS_PROXY=${HTTPS_PROXY:-},NO_PROXY=${NO_PROXY:-},http_proxy=${http_proxy:-},https_proxy=${https_proxy:-},no_proxy=${no_proxy:-}"
5453
# Disable pod creation as these are one-off commands and creating a pod
@@ -61,7 +60,7 @@ else
6160
fi
6261
dcb="$dc build $proxy_args"
6362
dbuild="$CONTAINER_ENGINE build $proxy_args"
64-
dcx="$dc exec $exec_proxy_args"
63+
dcx="$dc exec -e HTTP_PROXY=${HTTP_PROXY:-} -e HTTPS_PROXY=${HTTPS_PROXY:-} -e NO_PROXY=${NO_PROXY:-} -e http_proxy=${http_proxy:-} -e https_proxy=${https_proxy:-} -e no_proxy=${no_proxy:-}"
6564
echo "$dcr"
6665
# Utility function to handle --wait with docker and podman
6766
function start_service_and_wait_ready() {

0 commit comments

Comments
 (0)