diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:06 +0000 |
| commit | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (patch) | |
| tree | 2b991061d4292373b31cb1c0a70479629c9fd9f3 /docker/base | |
| parent | e9289eaa1ca59a59c6eda79197794f42fd2d4bfc (diff) | |
| parent | d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (diff) | |
| download | kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.tar.gz kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.zip | |
Merge "Debian/Ubuntu: move to Python 3 for source images"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 38372f72d..b61a6a989 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -317,7 +317,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'netbase', 'open-iscsi', 'procps', - 'python', + 'python3', 'socat', 'sudo', 'tgt'] @@ -390,17 +390,19 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* {% endblock %} -{% 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/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 %} +# 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 %} @@ -410,6 +412,10 @@ RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth {% endif %} COPY set_configs.py /usr/local/bin/kolla_set_configs +{% if distro_python_version.startswith('3') %} +RUN sed -i -e "s+#\!/usr/bin/env python+#\!/usr/bin/env python3+g" /usr/local/bin/kolla_set_configs +{% endif %} + COPY start.sh /usr/local/bin/kolla_start COPY sudoers /etc/sudoers COPY curlrc /root/.curlrc |