7e2486c3d9
The pypi package 'docker-py' [1] has been renamed to 'docker' [2]. It is better to move to the new 'docker' package because the old package will be deprecated and all the new features will go into the new package only. Package 'docker' has been added to requirements [3]. The old package 'docker-py' is still allowed to be in the global requirements during the transition period but it should be removed after all or most of the projects finsih the migration. [1] https://pypi.python.org/pypi/docker-py [2] https://pypi.python.org/pypi/docker [3] https://review.openstack.org/#/c/423715/ Change-Id: I3ffd8bb6461e8b7edacc5e833754f00c4249b854
36 lines
1.1 KiB
Django/Jinja
36 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block dind_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
|
|
# Since the gate cannot do DinD on centos due to the age of the kernel, we don't
|
|
# build a true DinD image. Should the time come that we get a newer kernel in
|
|
# the centos gate and we want to do multinode we can populate this container
|
|
RUN /bin/true
|
|
|
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
|
{% set dind_packages = [
|
|
'btrfs-tools',
|
|
'docker-engine',
|
|
'openssh-server'
|
|
] %}
|
|
{{ macros.install_packages(dind_packages | customizable("packages")) }}
|
|
|
|
{% set dind_pip_packages = [
|
|
'docker'
|
|
] %}
|
|
|
|
RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }}
|
|
|
|
{% endif %}
|
|
|
|
COPY start.sh /usr/local/bin/kolla_start
|
|
RUN chmod 755 /usr/local/bin/kolla_start
|
|
|
|
{% block dind_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|