diff options
| author | Maksim Malchuk <maksim.malchuk@gmail.com> | 2020-12-16 21:26:56 +0300 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2022-03-11 15:58:05 +0300 |
| commit | 83efe325462e683e2c99d088012cd611d7a0b138 (patch) | |
| tree | fa3d965238b19b976c705fd8c4ec68bd4ff945d3 /docker/prometheus/prometheus-haproxy-exporter | |
| parent | 5bb6489922aab2b431be8f121465eb7f3a49b5ae (diff) | |
| download | kolla-83efe325462e683e2c99d088012cd611d7a0b138.tar.gz kolla-83efe325462e683e2c99d088012cd611d7a0b138.zip | |
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 <maksim.malchuk@gmail.com>
Diffstat (limited to 'docker/prometheus/prometheus-haproxy-exporter')
| -rw-r--r-- | docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 index 0242b16ef..ffa0fa623 100644 --- a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 @@ -6,11 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block haproxy_exporter_header %}{% endblock %} {% block haproxy_exporter_repository_version %} -ENV haproxy_exporter_version=0.10.0 +ARG haproxy_exporter_version=0.10.0 +ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz {% endblock %} {% block haproxy_exporter_install %} -RUN curl -o /tmp/haproxy_exporter.tar.gz https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz \ +RUN curl -o /tmp/haproxy_exporter.tar.gz ${haproxy_exporter_url} \ && tar xvf /tmp/haproxy_exporter.tar.gz -C /opt/ \ && rm -f /tmp/haproxy_exporter.tar.gz \ && ln -s /opt/haproxy_exporter* /opt/haproxy_exporter |