From bf614899230893ad5b340746a66528f8caba8459 Mon Sep 17 00:00:00 2001
From: Kabir Sial <kabirsial@gmail.com>
Date: Tue, 9 Aug 2016 17:18:43 -0700
Subject: [PATCH] Customizations for dind
This patchset contains customization of Dockerfile of dind
Partially-implements: blueprint third-party-plugin-support
Change-Id: Iba4e3fba86b2b0a7a93b1a971fda308f9111e221
---
docker/dind/Dockerfile.j2 | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
index e1622aeff4..f41409e2b3 100644
--- a/docker/dind/Dockerfile.j2
+++ b/docker/dind/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
+
{% 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
@@ -9,18 +11,18 @@ MAINTAINER {{ maintainer }}
RUN /bin/true
{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get update \
- && apt-get -y install --no-install-recommends \
- btrfs-tools \
- docker-engine \
- openssh-server \
- && apt-get clean \
- && pip --no-cache-dir install --upgrade docker-py
+ {% set dind_packages = [
+ 'btrfs-tools',
+ 'docker-engine',
+ 'openssh-server'
+ ] %}
+{{ macros.install_packages(dind_packages | customizable("packages")) }}
+RUN pip --no-cache-dir install --upgrade docker-py
{% endif %}
COPY start.sh /usr/local/bin/kolla_start
RUN chmod 755 /usr/local/bin/kolla_start
+{% block dind_footer %}{% endblock %}
{{ include_footer }}