diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 11:08:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 11:08:01 +0000 |
| commit | 38a7ec76853d37d3211fb954e904a89184659f89 (patch) | |
| tree | b89d3404dac3f98dd63e98fa16487c20a6ee2495 /docker | |
| parent | b092f9835cc3e72014ee05eb32c116d933f5a0eb (diff) | |
| parent | 348dc0fd1300e462918b331d44813880b20c5512 (diff) | |
| download | kolla-38a7ec76853d37d3211fb954e904a89184659f89.tar.gz kolla-38a7ec76853d37d3211fb954e904a89184659f89.zip | |
Merge "Customizations for heka"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heka/Dockerfile.j2 | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index b2c326bbe..0162b5726 100644 --- a/docker/heka/Dockerfile.j2 +++ b/docker/heka/Dockerfile.j2 @@ -1,22 +1,23 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% import "macros.j2" as macros with context %} -RUN yum -y install \ - https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm \ - && yum clean all \ - && useradd --user-group heka \ +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set heka_packages = [ + 'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm' + ] %} +RUN useradd --user-group heka \ && mkdir /etc/heka {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN curl --location https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka_0.10.0_amd64.deb -o heka_0.10.0_amd64.deb \ - && dpkg -i heka_0.10.0_amd64.deb \ - && rm -f heka_0.10.0_amd64.deb - + {% set heka_packages = [ + 'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka_0.10.0_amd64.deb' + ] %} {% endif %} +RUN {{ macros.install_packages(heka_packages | customizable("packages")) }} + COPY plugins/modules /usr/share/heka/lua_modules/ COPY plugins/decoders /usr/share/heka/lua_decoders/ COPY plugins/encoders /usr/share/heka/lua_encoders/ @@ -29,6 +30,8 @@ RUN usermod -a -G kolla heka \ && chmod 755 /usr/local/bin/kolla_extend_start \ && chown -R heka: /usr/share/heka /etc/heka +{% block heka_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER heka |