Skip to content
Snippets Groups Projects
Commit 2df3d250 authored by Serguei Bezverkhi's avatar Serguei Bezverkhi
Browse files

Fixing crond crashing with centos/source

This PS address the issue encountered with the latest master, crond
container's docker file did not have any logic for source type of
installation as a result no binaries were install causing container's
constant restart. Fixing logic in cron's docker file.

Change-Id: I318aa9cb16517e21e0fe58393ee577701331b077
Closes-Bug: #1607336
parent c8950340
No related branches found
No related tags found
No related merge requests found
...@@ -2,21 +2,19 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment