From f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9 Mon Sep 17 00:00:00 2001 From: Ahmad Mahmoudi Date: Thu, 19 Sep 2019 00:57:46 -0500 Subject: [PATCH] (airflow) - Added no_proxy env variable Added no_proxy environment variable to be able to reach internal repos when http_proxy is used. Change-Id: If23fb644bfc2a6486e9089ad5ca1eb21f81e7df6 --- Makefile | 2 +- tools/airflow_image_run.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cfc316ab..44cff068 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ tests: .PHONY: run run: - USE_PROXY=$(USE_PROXY) PROXY=$(PROXY) $(SCRIPT) $(IMAGE) + USE_PROXY=$(USE_PROXY) PROXY=$(PROXY) NO_PROXY=$(NO_PROXY) $(SCRIPT) $(IMAGE) _BASE_IMAGE_ARG := $(if $(DISTRO_BASE_IMAGE),--build-arg FROM="${DISTRO_BASE_IMAGE}" ,) ifeq ($(IMAGE_NAME), airflow) diff --git a/tools/airflow_image_run.sh b/tools/airflow_image_run.sh index e177a393..d6a14916 100755 --- a/tools/airflow_image_run.sh +++ b/tools/airflow_image_run.sh @@ -17,12 +17,14 @@ set -x IMAGE=$1 USE_PROXY=${USE_PROXY:-false} +NO_PROXY=${NO_PROXY:-} if [ "${USE_PROXY}" == "true" ]; then TEST_RESP="$(docker run \ -p 8080:8080 \ --env HTTP_PROXY="${PROXY}" \ --env HTTPS_PROXY="${PROXY}" \ + --env NO_PROXY="${NO_PROXY}" \ --name airflow_test ${IMAGE} \ quicktest)" else