openstack
/
kolla
Code Issues Proposed changes

Merge "Add fluentd_binary and fluentd_version labels"

This commit is contained in:
Zuul 2019-08-22 09:09:18 +00:00 committed by Gerrit Code Review
parent 241fc840b4 23f6d2ab01
commit 857cf3effc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/fluentd/Dockerfile.j2
View File

@ -1,5 +1,10 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% if base_package_type == 'rpm' or base_arch != 'x86_64' %}
LABEL fluentd_version="0.12" fluentd_binary="fluentd"
{% else %}
LABEL fluentd_version="0.14" fluentd_binary="td-agent"
{% endif %}
{% block fluentd_header %}{% endblock %}