diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-15 11:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-15 11:34:58 +0000 |
| commit | b3bd634688b6f27141c18231bc286b90a8ebd86f (patch) | |
| tree | c52c343185ed4a960574fab4d3716810630e5330 /docker/fluentd | |
| parent | 61744a7bbf3283b83aee635e07ea482690df0405 (diff) | |
| parent | 83efe325462e683e2c99d088012cd611d7a0b138 (diff) | |
| download | kolla-b3bd634688b6f27141c18231bc286b90a8ebd86f.tar.gz kolla-b3bd634688b6f27141c18231bc286b90a8ebd86f.zip | |
Merge "Unify curl use (customisation options)"
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index c9c8277ea..3351fcda4 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -61,12 +61,15 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% endblock %} +{% block fluentd_monasca_plugin_version %} +ARG monasca_output_plugin_version=1.0.2 +ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive/${monasca_output_plugin_version}.tar.gz +{% endblock %} + {% block fluentd_monasca_plugin_install %} # Build and install Fluentd output plugin for Monasca API -ARG monasca_output_plugin_tag=1.0.2 -ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive/$monasca_output_plugin_tag.tar.gz -RUN curl $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \ +RUN curl ${monasca_output_plugin_url} -o /tmp/fluentd-monasca.tar.gz \ && tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \ && cd /tmp/fluentd-monasca-* \ && td-agent-gem build fluentd-monasca-output.gemspec \ |