diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-07-08 11:16:42 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-07-20 12:58:49 +0200 |
| commit | c19a222b4c2540f0875a47038f5edac9bb1c8a4d (patch) | |
| tree | 068715585a314fbce2830c1ef3743924b7e4f054 /docker | |
| parent | 198986c51fcefef7da5c76f89400101084452ebb (diff) | |
| download | kolla-c19a222b4c2540f0875a47038f5edac9bb1c8a4d.tar.gz kolla-c19a222b4c2540f0875a47038f5edac9bb1c8a4d.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/td.repo | 2 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cdf79d66a..cb983bb99 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -92,6 +92,7 @@ COPY dnf.conf /etc/dnf/dnf.conf {% set base_yum_repo_files = [ 'grafana.repo', 'rabbitmq_rabbitmq-server.repo', + 'td.repo', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # diff --git a/docker/base/td.repo b/docker/base/td.repo index 38dcc6d44..cea423169 100644 --- a/docker/base/td.repo +++ b/docker/base/td.repo @@ -1,6 +1,6 @@ [treasuredata] name=TreasureData -baseurl=http://packages.treasuredata.com/3/redhat/$releasever/$basearch +baseurl=http://packages.treasuredata.com/4/redhat/$releasever/$basearch gpgcheck=1 gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent enabled=0 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 %} |