diff options
| author | Serguei Bezverkhi <sbezverk@cisco.com> | 2016-07-28 08:02:23 -0400 |
|---|---|---|
| committer | Serguei Bezverkhi <sbezverk@cisco.com> | 2016-07-28 08:06:31 -0400 |
| commit | 2df3d25019aef5ff9ef4040e70d5a19b3e77bbb8 (patch) | |
| tree | fbb127e01a958b15d70b52371cf1cc200f9c87e0 | |
| parent | c8950340300738e52f21f3e537ae2630d7f39e13 (diff) | |
| download | kolla-2df3d25019aef5ff9ef4040e70d5a19b3e77bbb8.tar.gz kolla-2df3d25019aef5ff9ef4040e70d5a19b3e77bbb8.zip | |
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
| -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 |