diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-22 09:09:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-22 09:09:18 +0000 |
| commit | 857cf3effcda2dcd178fd74c70d8384f0c22ca40 (patch) | |
| tree | 78437850bc6400cf2fff2f9dff36181dff523730 /docker/fluentd | |
| parent | 241fc840b439910a016d45bfde96160c7041b5ec (diff) | |
| parent | 23f6d2ab011a1d664976ced95310d0dbc49d0d00 (diff) | |
| download | kolla-857cf3effcda2dcd178fd74c70d8384f0c22ca40.tar.gz kolla-857cf3effcda2dcd178fd74c70d8384f0c22ca40.zip | |
Merge "Add fluentd_binary and fluentd_version labels"
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 98b07ea62..3423bd0b2 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -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 %} |