openstack/kolla-ansible
Code Issues Proposed changes

Customizations for dind

Browse Source 
This patchset contains customization of Dockerfile of dind
Partially-implements: blueprint third-party-plugin-support

Change-Id: Iba4e3fba86b2b0a7a93b1a971fda308f9111e221
This commit is contained in:
Kabir Sial 2016-08-09 17:18:43 -07:00 committed by Sridar Kandaswamy
parent 4b7852096f
commit bf61489923
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/dind/Dockerfile.j2
View File

@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# Since the gate cannot do DinD on centos due to the age of the kernel, we don't # Since the gate cannot do DinD on centos due to the age of the kernel, we don't
@ -9,18 +11,18 @@ MAINTAINER {{ maintainer }}
RUN /bin/true RUN /bin/true
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set dind_packages = [
RUN apt-get update \ 'btrfs-tools',
&& apt-get -y install --no-install-recommends \ 'docker-engine',
btrfs-tools \ 'openssh-server'
docker-engine \ ] %}
openssh-server \ {{ macros.install_packages(dind_packages | customizable("packages")) }}
&& apt-get clean \ RUN pip --no-cache-dir install --upgrade docker-py
&& pip --no-cache-dir install --upgrade docker-py
{% endif %} {% endif %}
COPY start.sh /usr/local/bin/kolla_start COPY start.sh /usr/local/bin/kolla_start
RUN chmod 755 /usr/local/bin/kolla_start RUN chmod 755 /usr/local/bin/kolla_start
{% block dind_footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}