Fix python tests in 2.7 by converting pip option to an env var

docker-library · Oct 23, 2023 · 44b79e2 · 44b79e2
1 parent 69e253d
commit 44b79e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/tests/python-pip-requests-ssl/container.py b/test/tests/python-pip-requests-ssl/container.py
@@ -1,5 +1,5 @@
 import subprocess, sys
-subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--root-user-action', 'ignore', 'requests'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'ignore', 'requests'])
 
 import requests
 r = requests.get('https://google.com')

diff --git a/test/tests/run-python-in-container.sh b/test/tests/run-python-in-container.sh
@@ -25,6 +25,7 @@ case "$1" in
 		source "$runDir/run-in-container.sh" \
 			--docker-arg --env=PIP_DISABLE_PIP_VERSION_CHECK=1 \
 			--docker-arg --env=PIP_NO_PYTHON_VERSION_WARNING=1 \
+			--docker-arg --env=PIP_ROOT_USER_ACTION=ignore \
 			"$testDir" "$1" "$python" container.py
 		;;
 
@@ -34,6 +35,7 @@ case "$1" in
 		source "$runDir/run-in-container.sh" \
 			--docker-arg --env=PIP_DISABLE_PIP_VERSION_CHECK=1 \
 			--docker-arg --env=PIP_NO_PYTHON_VERSION_WARNING=1 \
+			--docker-arg --env=PIP_ROOT_USER_ACTION=ignore \
 			"$testDir" "$1" sh -ec '
 				for c in pypy3 pypy python3 python; do
 					if [ -x "/usr/local/bin/$c" ]; then