diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-13 10:15:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-13 10:15:39 +0000 |
| commit | 6e50281a59caf59d3b2fd926efe58061ede5ea51 (patch) | |
| tree | aba5e823b571958ac14c165faa52ba4cdb615783 | |
| parent | 0811df6ac03f3abe2f347f30ce8d1316b43a944f (diff) | |
| parent | 374652d2d3fc978b1a86dd2105f13dfe35866a6d (diff) | |
| download | kolla-6e50281a59caf59d3b2fd926efe58061ede5ea51.tar.gz kolla-6e50281a59caf59d3b2fd926efe58061ede5ea51.zip | |
Merge "base: drop commented part about site-packages in Ubuntu"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2f42ab7db..1cdc9df25 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 %} |