From 9ad412a41810f20e24a3da19f7c1bbf5fdcc96d1 Mon Sep 17 00:00:00 2001
From: Abe Music <abe.music@gmail.com>
Date: Mon, 25 Jul 2016 08:58:26 -0500
Subject: [PATCH] Customizations for cron

This patchset contains customization of Dockerfile
of cron container

Change-Id: I7066b281d2a546e52ab0fdc2722da2e0026fc3a7
Partially-implements: blueprint third-party-plugin-support
---
 docker/cron/Dockerfile.j2 | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2
index 326e339539..b0d796538c 100644
--- a/docker/cron/Dockerfile.j2
+++ b/docker/cron/Dockerfile.j2
@@ -1,23 +1,26 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        cronie \
-        logrotate \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        cron \
-        logrotate \
-    && apt-get clean
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+        {% set cron_packages = [
+            'cronie',
+            'logrotate'
+        ] %}
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+        {% set cron_packages = [
+            'cron',
+            'logrotate'
+        ] %}
+    {% endif %}
 
+RUN {{ macros.install_packages(cron_packages | customizable("packages")) }}
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
+{% block cron_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}