diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 20:22:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 20:22:15 +0000 |
| commit | a28b246259ee45d54d036d1db3d6ca19318fbafc (patch) | |
| tree | 469cdf10e38ea625c3656edf55c60616f74e2f10 /docker | |
| parent | 4a5859bb4690bed22c3d8ca44aa376d2058d440b (diff) | |
| parent | 32a4cadac9072d630146e0fb667aec146fcd186f (diff) | |
| download | kolla-a28b246259ee45d54d036d1db3d6ca19318fbafc.tar.gz kolla-a28b246259ee45d54d036d1db3d6ca19318fbafc.zip | |
Merge "Add cron image and playbook"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cron/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | docker/cron/extend_start.sh | 7 |
2 files changed, 30 insertions, 0 deletions
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 new file mode 100644 index 000000000..fd7b53cd5 --- /dev/null +++ b/docker/cron/Dockerfile.j2 @@ -0,0 +1,23 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + cronie \ + logrotate \ + && yum clean all + +{% elif base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends \ + cron \ + logrotate \ + && apt-get clean + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{{ include_footer }} diff --git a/docker/cron/extend_start.sh b/docker/cron/extend_start.sh new file mode 100644 index 000000000..08efca96f --- /dev/null +++ b/docker/cron/extend_start.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# NOTE(elemoine): the cron daemon sends its logs to /dev/log. Heka's log socket +# is at /var/lib/kolla/heka/log so we symlink /dev/log to that location. +if [[ ! -h /dev/log ]]; then + ln -sf /var/lib/kolla/heka/log /dev/log +fi |