From 83efe325462e683e2c99d088012cd611d7a0b138 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Wed, 16 Dec 2020 21:26:56 +0300 Subject: Unify curl use (customisation options) This change adds and unifies an ability to override hardcoded URLs for air-gapped environments via the usual blocks mechanism. Also, this change replaces ENV with ARG instruction for the variables used only in building images, and uses bash variable expansion where it possible. This change is a continuation of the I46b77978926fc2b578a68d1aaa944b2198af0685 Change-Id: I1fbad333b1bc95484e6f4c5145d5936a0e2db84f Signed-off-by: Maksim Malchuk --- docker/fluentd/Dockerfile.j2 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'docker/fluentd') 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 \ -- cgit v1.2.3