openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fixing crond crashing with centos/source"

Browse Source
This commit is contained in:
Jenkins 2016-07-28 20:52:31 +00:00 committed by Gerrit Code Review
commit 6ffab8e65f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker/cron/Dockerfile.j2
View File

@ -2,21 +2,19 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set cron_packages = [
{% set cron_packages = [ 'cronie',
'cronie', 'logrotate'
'logrotate' ] %}
] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% set cron_packages = [
{% set cron_packages = [ 'cron',
'cron', 'logrotate'
'logrotate' ] %}
] %} {% endif %}
{% endif %}
RUN {{ macros.install_packages(cron_packages | customizable("packages")) }} RUN {{ macros.install_packages(cron_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start