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/skydive | |
| 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/skydive')
| -rw-r--r-- | docker/skydive/skydive-base/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index e5b939071..5342f7e99 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -10,13 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='skydive') }} +{% block skydive_version %} +ARG skydive_version=0.26.0 +ARG skydive_url=https://github.com/skydive-project/skydive/releases/download/v${skydive_version}/skydive +{% endblock %} + {% block skydive_install %} {% if base_arch != 'x86_64' %} RUN echo 'image on {{ base_distro }} is not yet available on non x86_64 platforms' \ && /bin/false {% else %} -RUN curl -o /usr/bin/skydive "https://github.com/skydive-project/skydive/releases/download/v0.26.0/skydive" \ +RUN curl -o /usr/bin/skydive ${skydive_url} \ && chmod +x /usr/bin/skydive {% endif %} |