diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2019-08-14 13:44:05 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2019-08-19 11:56:15 +0000 |
| commit | 23f6d2ab011a1d664976ced95310d0dbc49d0d00 (patch) | |
| tree | 32c769d84089fe85fc512d91d68e35fa5f8370c4 /docker | |
| parent | 0ffd3aefda90fd7206f4b0989ff17ace414423fe (diff) | |
| download | kolla-23f6d2ab011a1d664976ced95310d0dbc49d0d00.tar.gz kolla-23f6d2ab011a1d664976ced95310d0dbc49d0d00.zip | |
Add fluentd_binary and fluentd_version labels
In order to orchestrate a smooth migration of fluentd to newer
td-agent on CentOS x86_64, a label that points to fluentd binary
and version are needed.
Depends-On: https://review.opendev.org/677144/
Change-Id: Ie2257870d87c5b3a9b0572f8fd35085a3f95fedb
Diffstat (limited to 'docker')
| -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 0f5c6f95c..83cebe680 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 %} |