Skip to content

Commit

Permalink
[FIX] Dependency Conflict with urllib3
Browse files Browse the repository at this point in the history
  • Loading branch information
janmattfeld committed Jul 24, 2017
1 parent 98a47e7 commit f608818
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,13 @@ RUN /devstack/tools/install_prereqs.sh \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install external pip, resolving missing python-setuptools and wheel errors
RUN curl --silent --show-error https://bootstrap.pypa.io/get-pip.py | python \
RUN curl --silent --show-error https://bootstrap.pypa.io/get-pip.py | python

# Install known working Python packages
&& pip install \
# Solve dependency conflict for urllib3 with pre-installed requests
RUN pip install --upgrade --force-reinstall requests

# Install known working Python packages
RUN pip install \
--no-cache-dir \
--constraint /opt/stack/requirements/upper-constraints.txt \
--requirement /opt/stack/requirements/global-requirements.txt \
Expand Down

0 comments on commit f608818

Please sign in to comment.