diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-28 20:52:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-28 20:52:31 +0000 |
| commit | 6ffab8e65fb2087746b3ac35b7eea33a243816cd (patch) | |
| tree | e83d145e838579e2e362485efdf1091db2f0bf25 | |
| parent | be77c38cfbd9e8bc86d519a6fd690a7432329584 (diff) | |
| parent | 2df3d25019aef5ff9ef4040e70d5a19b3e77bbb8 (diff) | |
| download | kolla-6ffab8e65fb2087746b3ac35b7eea33a243816cd.tar.gz kolla-6ffab8e65fb2087746b3ac35b7eea33a243816cd.zip | |
Merge "Fixing crond crashing with centos/source"
| -rw-r--r-- | docker/cron/Dockerfile.j2 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index b0d796538..408943255 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -2,21 +2,19 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% 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 %} +{% 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 |