diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 05:30:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 05:30:01 +0000 |
| commit | f875586ebb83ee272ee1480593e81cde875fcc4c (patch) | |
| tree | ec44a3d53dd4a0a3d98a577435441c5f54684556 | |
| parent | aa7b6f4873bccdbe3fcce2d4f20c3ad887dce025 (diff) | |
| parent | d568c47207340cd481404f43bc3fdb00d0af356f (diff) | |
| download | kolla-f875586ebb83ee272ee1480593e81cde875fcc4c.tar.gz kolla-f875586ebb83ee272ee1480593e81cde875fcc4c.zip | |
Merge "Ubuntu - Sync directories"
| -rwxr-xr-x | docker_templates/base/Dockerfile.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2 index 7b498ed40..807f3fe6c 100755 --- a/docker_templates/base/Dockerfile.j2 +++ b/docker_templates/base/Dockerfile.j2 @@ -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' %} |