openstack/kolla-ansible
Code Issues Proposed changes

Merge "Ubuntu - Sync directories"

Browse Source
This commit is contained in:
Jenkins 2015-08-25 05:30:01 +00:00 committed by Gerrit Code Review
commit f875586ebb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker_templates/base/Dockerfile.j2
View File

@ -211,9 +211,12 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
libffi-dev \
libyaml-dev \
pkg-config \
&& apt-get clean
&& apt-get clean \
&& sed -i "s|'purelib': '\$base/local/lib/python\$py_version_short/dist-packages',|'purelib': '\$base/lib/python\$py_version_short/dist-packages',|;s|'platlib': '\$platbase/local/lib/python\$py_version_short/dist-packages',|'platlib': '\$platbase/lib/python\$py_version_short/dist-packages',|;s|'headers': '\$base/local/include/python\$py_version_short/\$dist_name',|'headers': '\$base/include/python\$py_version_short/\$dist_name',|;s|'scripts': '\$base/local/bin',|'scripts': '\$base/bin',|;s|'data' : '\$base/local',|'data' : '\$base',|" /usr/lib/python2.7/distutils/command/install.py \
&& rm -rf /usr/lib/python2.7/site-packages \
&& ln -s dist-packages /usr/lib/python2.7/site-packages
# Endif for install_type source
# Endif for base_distro ubuntu,debian
{% endif %}
{% if install_type == 'source' %}