aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-05-25 11:18:46 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-05-25 11:19:35 +0200
commit9fb5ed7379ed7fc96d0aeda70411d696bd6cba65 (patch)
treee93f709e9e6218645d588393cfabfff8d7d4f51d
parentd340a8e8f99fef80c5fa3a45c4e1b06e5b0aeb39 (diff)
Remove six from Openstack requirements
Attempting uninstall: six Found existing installation: six 1.15.0 [91mERROR: Cannot uninstall 'six'. It is a distutils installed project and thus we cannot accurately determine which files belong to it which would lead to only a partial uninstall. https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L445 Change-Id: Iad64341d8014621bc999bade94676d4059e71353 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 45248ff2..c746fd06 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -9,6 +9,7 @@ RUN apk -U upgrade && \
python3-dev build-base libxml2-dev libxslt-dev linux-headers && \
wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
sed -i -E /^PyYAML==+.*$/d upper-constraints.txt && \
+ sed -i -E /^six==+.*$/d upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \
pip3 install --no-cache-dir \
-cupper-constraints.txt \