openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for cron"

Browse Source
This commit is contained in:
Jenkins 2016-07-26 03:30:59 +00:00 committed by Gerrit Code Review
commit 7a48b61e89
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docker/cron/Dockerfile.j2
View File

@ -1,23 +1,26 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% 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 = [
RUN yum -y install \ 'cronie',
cronie \ 'logrotate'
logrotate \ ] %}
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set cron_packages = [
'cron',
'logrotate'
] %}
{% endif %}
RUN apt-get -y install --no-install-recommends \ RUN {{ macros.install_packages(cron_packages | customizable("packages")) }}
cron \
logrotate \
&& apt-get clean
{% endif %} {% 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
{% block cron_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}