From 45da85124f0d52b090f06f6fb74c8d27aee75da9 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 3 Aug 2020 10:26:30 -0700
Subject: [PATCH] Use pip install -r not -f to install extras
The pip install -f flag is for find-links which is a list of locations
to look for python packages. What we hvae at this path for extras
installation is a list of packages themselves not locations to find
them. We need to use the -r flag for requirements lists to specify this
instead.
This change should update our zuul and nodepool images to include useful
debugging extras.
Change-Id: I647bb835d0c85c3772e1593866a54cfc5ea1db2f
---
docker/python-builder/scripts/install-from-bindep | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/python-builder/scripts/install-from-bindep b/docker/python-builder/scripts/install-from-bindep
index 65419433e6..59686bfe34 100755
--- a/docker/python-builder/scripts/install-from-bindep
+++ b/docker/python-builder/scripts/install-from-bindep
@@ -35,7 +35,7 @@ fi
# Add any requested extras to the list of things to install
EXTRAS=""
for extra in $* ; do
- EXTRAS="${EXTRAS} -f /output/$extra/requirements.txt"
+ EXTRAS="${EXTRAS} -r /output/$extra/requirements.txt"
done
if [ -f /output/packages.txt ] ; then