diff --git a/install/build-docker-images.sh b/install/build-docker-images.sh index 671597eec46..63bb0dac429 100644 --- a/install/build-docker-images.sh +++ b/install/build-docker-images.sh @@ -3,8 +3,8 @@ echo "${_group}Building and tagging Docker images ..." echo "" # Build any service that provides the image sentry-self-hosted-local first, # as it is used as the base image for sentry-cleanup-self-hosted-local. -$dc build --build-arg "http_proxy=${http_proxy:-}" --build-arg "https_proxy=${https_proxy:-}" --build-arg "no_proxy=${no_proxy:-}" --force-rm web -$dc build --build-arg "http_proxy=${http_proxy:-}" --build-arg "https_proxy=${https_proxy:-}" --build-arg "no_proxy=${no_proxy:-}" --force-rm +$dc build --force-rm web +$dc build --force-rm echo "" echo "Docker images built." diff --git a/install/install-wal2json.sh b/install/install-wal2json.sh index 2973c0034df..34faee16a0a 100644 --- a/install/install-wal2json.sh +++ b/install/install-wal2json.sh @@ -5,9 +5,7 @@ ARCH=$(uname -m) FILE_NAME="wal2json-Linux-$ARCH-glibc.so" docker_curl() { - # The environment variables can be specified in lower case or upper case. - # The lower case version has precedence. http_proxy is an exception as it is only available in lower case. - docker run --rm -e http_proxy -e https_proxy -e HTTPS_PROXY -e no_proxy -e NO_PROXY curlimages/curl:7.77.0 "$@" + docker run --rm curlimages/curl:7.77.0 "$@" } if [[ $WAL2JSON_VERSION == "latest" ]]; then