Merge pull request docker#553 from bbodenmiller/patch-3

clear all_proxy if not socks address
s0mewha7 · Aug 18, 2016 · 6c900e6 · 6c900e6
2 parents da301e5 + 8955368
commit 6c900e6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
@@ -11,6 +11,14 @@ NC='\033[0m'
 unset DYLD_LIBRARY_PATH
 unset LD_LIBRARY_PATH
 
+#clear all_proxy if not socks address
+if  [[ $ALL_PROXY != socks* ]]; then
+  unset ALL_PROXY
+fi
+if  [[ $all_proxy != socks* ]]; then
+  unset all_proxy
+fi
+
 clear
 
 if [ ! -f "${DOCKER_MACHINE}" ]; then

diff --git a/windows/start.sh b/windows/start.sh
@@ -20,6 +20,13 @@ BLUE='\033[1;34m'
 GREEN='\033[0;32m'
 NC='\033[0m'
 
+#clear all_proxy if not socks address
+if  [[ $ALL_PROXY != socks* ]]; then
+  unset ALL_PROXY
+fi
+if  [[ $all_proxy != socks* ]]; then
+  unset all_proxy
+fi
 
 if [ ! -f "${DOCKER_MACHINE}" ]; then
   echo "Docker Machine is not installed. Please re-run the Toolbox Installer and try again."