diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-26 03:30:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-26 03:30:59 +0000 |
| commit | 7a48b61e89846505dc835a9cdadc2049f2a62fc6 (patch) | |
| tree | 727928da40559a97d90226bd6cde4f96d04ca08a | |
| parent | a06a57ba54d0956bcb09796f9c368703a3a468dd (diff) | |
| parent | 9ad412a41810f20e24a3da19f7c1bbf5fdcc96d1 (diff) | |
| download | kolla-7a48b61e89846505dc835a9cdadc2049f2a62fc6.tar.gz kolla-7a48b61e89846505dc835a9cdadc2049f2a62fc6.zip | |
Merge "Customizations for cron"
| -rw-r--r-- | docker/cron/Dockerfile.j2 | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 326e33953..b0d796538 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 }} |