From 8062b9d42b0ea796b2c4a9d268d76a5c216b507a Mon Sep 17 00:00:00 2001
From: liuqi <liuqi10@xiaomi.com>
Date: Wed, 13 Feb 2019 14:30:35 +0800
Subject: [PATCH] BUG: ImportError in system pip wrappers after an upgrade

---
 third_party/caffe/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/third_party/caffe/Dockerfile b/third_party/caffe/Dockerfile
index 4bf9e94b..92f67f23 100644
--- a/third_party/caffe/Dockerfile
+++ b/third_party/caffe/Dockerfile
@@ -31,8 +31,10 @@ WORKDIR $CAFFE_ROOT
 # https://github.com/docker/hub-feedback/issues/460
 ENV CLONE_TAG=1.0
 
+# ImportError in system pip wrappers after an upgrade.
+# https://github.com/pypa/pip/issues/5599
 RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \
-    pip install --upgrade pip && \
+    python -m pip install --upgrade pip && \
     cd python && for req in $(cat requirements.txt) pydot; do pip install $req; done && cd .. && \
     mkdir build && cd build && \
     cmake -DCPU_ONLY=1 .. && \
-- 
GitLab