Skip to content

Commit 0e3a9d0

Browse files
committed
Fix setting the HTTPS proxy
Some places were not correctly setting the HTTPS proxy, and were only setting the HTTP proxy. This was fine until Docker 20.10.10, which then started using `https_proxy` for HTTPS connections. Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent 243d0c7 commit 0e3a9d0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

slave.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -788,8 +788,9 @@ $(SONIC_INSTALL_WHEELS) : $(PYTHON_WHEELS_PATH)/%-install : .platform $$(addsuff
788788

789789
# start docker daemon
790790
docker-start :
791-
@sudo sed -i '/http_proxy/d' /etc/default/docker
791+
@sudo sed -i -e '/http_proxy/d' -e '/https_proxy/d' /etc/default/docker
792792
@sudo bash -c "{ echo \"export http_proxy=$$http_proxy\"; \
793+
echo \"export https_proxy=$$https_proxy\"; \
793794
echo \"export no_proxy=$$no_proxy\"; } >> /etc/default/docker"
794795
@test x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) != x"y" && sudo service docker status &> /dev/null || ( sudo service docker start &> /dev/null && ./scripts/wait_for_docker.sh 60 )
795796

@@ -976,7 +977,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_DBG_IMAGES)) : $(TARGET_PATH)/%-$(DBG_IMAG
976977
docker build \
977978
$(if $($*.gz_DBG_DEPENDS), --squash --no-cache, --no-cache) \
978979
--build-arg http_proxy=$(HTTP_PROXY) \
979-
--build-arg http_proxy=$(HTTP_PROXY) \
980+
--build-arg https_proxy=$(HTTPS_PROXY) \
980981
--build-arg no_proxy=$(NO_PROXY) \
981982
--build-arg docker_container_name=$($*.gz_CONTAINER_NAME) \
982983
--label com.azure.sonic.manifest="$$(cat $($*.gz_PATH)/manifest.json)" \

0 commit comments

Comments
 (0)