From 23f6d2ab011a1d664976ced95310d0dbc49d0d00 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 14 Aug 2019 13:44:05 +0000 Subject: [PATCH] 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 --- docker/fluentd/Dockerfile.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 0f5c6f95c9..83cebe680a 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 %}