openstack
/
kolla
Code Issues Proposed changes

Merge "base: drop commented part about site-packages in Ubuntu"

This commit is contained in:
Zuul 2020-01-13 10:15:39 +00:00 committed by Gerrit Code Review
parent 0811df6ac0 374652d2d3
commit 6e50281a59
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/base/Dockerfile.j2
View File

@ -401,20 +401,6 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
{% endblock %}
# FIXME(mgoddard): Some images, including Horizon, depend on Ubuntu having a
# site-packages directory.
#{% if base_distro == 'ubuntu' %}
#RUN sed -i \
# -e "s|\('purelib': '\$base/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
# -e "s|\('platlib': '\$platbase/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
# -e "s|\('headers': '\$base/\)local/\(include/python\$py_version_short/\$dist_name',\)|\1\2|" \
# -e "s|\('scripts': '\$base/\)local/\(bin',\)|\1\2|" \
# -e "s|\('data' : '\$base\)/local\(',\)|\1\2|" \
# /usr/lib/python{{ distro_python_version }}/distutils/command/install.py \
# && rm -rf /usr/lib/python{{ distro_python_version }}/site-packages \
# && ln -s dist-packages /usr/lib/{{ distro_python_version }}/site-packages
#{% endif %}
{# endif base_package_type deb #}
{% endif %}