diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 17:47:10 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 17:47:10 +0100 |
| commit | 374652d2d3fc978b1a86dd2105f13dfe35866a6d (patch) | |
| tree | 96de8d9b0ec4e52a29e696e646b8aae88aef9a1d /docker/base | |
| parent | f870f058d6c3f3a68619e5f3fd52dca64b6832f4 (diff) | |
| download | kolla-374652d2d3fc978b1a86dd2105f13dfe35866a6d.tar.gz kolla-374652d2d3fc978b1a86dd2105f13dfe35866a6d.zip | |
base: drop commented part about site-packages in Ubuntu
Turned out that since we commented mangling of system-wide Python
packages nothing broke. So let's get rid of that part.
Change-Id: I9e3a4424c584fb14cca50bb0b9392f7227161acc
Diffstat (limited to 'docker/base')
| -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 3001028fa..d9215d643 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -399,20 +399,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 %} |