From c19a222b4c2540f0875a47038f5edac9bb1c8a4d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 8 Jul 2020 11:16:42 +0200 Subject: fluentd: migrate to td-agent 4 where possible td-agent 4 got released for all distributions we support. For both x86-64 and aarch64 architectures. Change-Id: I86ecdc1ac45dfd76b94a34d1b837f7c0bc975dcd --- docker/fluentd/Dockerfile.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/fluentd') diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index c330ab878..cb6e84b77 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -2,10 +2,10 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -{% if base_package_type == 'rpm' and base_arch != 'x86_64' %} +{% if base_package_type == 'rpm' and base_arch not in ['aarch64', 'x86_64'] %} LABEL fluentd_version="0.12" fluentd_binary="fluentd" {% set fluentd_user = 'fluentd' %} -{% elif base_package_type == 'deb' and base_arch != 'x86_64' %} +{% elif base_package_type == 'deb' and base_arch not in ['aarch64', 'x86_64'] %} LABEL fluentd_version="0.14" fluentd_binary="fluentd" {% set fluentd_user = 'fluentd' %} {% else %} @@ -26,7 +26,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" 'make' ] %} - {% if base_arch == 'x86_64' %} + {% if base_arch in ['aarch64', 'x86_64'] %} {% set fluentd_packages = fluentd_packages + [ 'td-agent' ] %} @@ -47,7 +47,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" 'make' ] %} - {% if base_arch == 'x86_64' %} + {% if base_arch in ['aarch64', 'x86_64'] %} {% set fluentd_packages = fluentd_packages + [ 'td-agent' ] %} @@ -65,7 +65,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" # Distro specific files and operations # Fluentd on rpm-based non-x86_64 is installed from rpm -{% if base_package_type == 'deb' and base_arch != 'x86_64' %} +{% if base_package_type == 'deb' and fluentd_binary == 'fluentd' %} RUN /usr/bin/gem install fluentd --no-rdoc --no-ri {% endif %} -- cgit v1.2.3