From bd8fbf960d403425c1617c14bf8f2eabb8ec50b8 Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Wed, 7 Jul 2021 16:10:54 +0200 Subject: [PATCH] fix(wal2json): Respect http_proxy/https_proxy/no_proxy when installing (#1026) `http_proxy`, `https_proxy` and `no_proxy` environment variables should be forwarded to the curl container. --- install/install-wal2json.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/install/install-wal2json.sh b/install/install-wal2json.sh index 2ff9c17..47e390e 100644 --- a/install/install-wal2json.sh +++ b/install/install-wal2json.sh @@ -4,11 +4,15 @@ FILE_TO_USE="../postgres/wal2json/wal2json.so" ARCH=$(uname -m) FILE_NAME="wal2json-Linux-$ARCH-glibc.so" -DOCKER_CURL="docker run --rm curlimages/curl" +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 "$@" +} if [[ $WAL2JSON_VERSION == "latest" ]]; then VERSION=$( - $DOCKER_CURL https://api.github.com/repos/getsentry/wal2json/releases/latest | + docker_curl https://api.github.com/repos/getsentry/wal2json/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' ) @@ -24,7 +28,7 @@ fi mkdir -p ../postgres/wal2json if [ ! -f "../postgres/wal2json/$VERSION/$FILE_NAME" ]; then mkdir -p "../postgres/wal2json/$VERSION" - $DOCKER_CURL -L \ + docker_curl -L \ "https://github.com/getsentry/wal2json/releases/download/$VERSION/$FILE_NAME" \ > "../postgres/wal2json/$VERSION/$FILE_NAME" fi