opendev
/
system-config
Code Issues Proposed changes

Upgrade pip in python-builder and base 

There was an issue in pip that prevented correctly caching locally
built wheels [1]. This has been fixed in recent pip versions so
upgrade pip in both images so image caching works correctly. This is
needed to unbreak nodepool images that fail to install the locally
built netifaces package.

[1] https://github.com/pypa/pip/issues/6852

Change-Id: Ibbe12bcc53253a80d0bafa3d09a20c49a3a2b784
This commit is contained in:
Tobias Henkel 2020-01-22 15:45:22 +01:00
parent 50fde43dfb
commit e35fcde591
No known key found for this signature in database
GPG Key ID: 03750DEC158E5FA2
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/python-base/Dockerfile
View File

@ -19,5 +19,10 @@ RUN apt-get update \
&& apt-get install -y dumb-init libjemalloc2 \ && apt-get install -y dumb-init libjemalloc2 \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Upgrade pip to fix wheel cache for locally built wheels
# See https://github.com/pypa/pip/issues/6852
RUN pip install -U pip
ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENTRYPOINT ["/usr/bin/dumb-init", "--"]

4
docker/python-builder/Dockerfile
View File

@ -32,3 +32,7 @@ RUN dpkg -i /tmp/python3-dev_4.0.0_all.deb \
&& rm /tmp/python3-dev_4.0.0_all.deb \ && rm /tmp/python3-dev_4.0.0_all.deb \
&& pip install --no-cache-dir bindep \ && pip install --no-cache-dir bindep \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Upgrade pip to fix wheel cache for locally built wheels
# See https://github.com/pypa/pip/issues/6852
RUN pip install -U pip