diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-24 18:26:47 -0400 |
|---|---|---|
| committer | Jorge Niedbalski <jorge.niedbalski@linaro.org> | 2018-06-04 09:14:38 -0400 |
| commit | e795f8580a4f88869a2905706b3a0d8110c5d26a (patch) | |
| tree | 61105dec8a50aed10da0ac744f41cd12dee29d7f | |
| parent | 578d3a8338c2b08d87ff1d66611ca37fa5d2351c (diff) | |
| download | kolla-e795f8580a4f88869a2905706b3a0d8110c5d26a.tar.gz kolla-e795f8580a4f88869a2905706b3a0d8110c5d26a.zip | |
cadvisor: add debian/aarch64 support
Use Debian package from unstable on Debian/aarch64. It works in
stretch-backports container fine and saves us from backporting huge pile
of Golang packages.
Change-Id: Ib4dd540446c58ee69bb46b36f5d7968910943e38
| -rw-r--r-- | docker/prometheus/prometheus-cadvisor/Dockerfile.j2 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index 3ecc9e3f3..ed0d32d54 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -3,14 +3,33 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_cadvisor_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% block prometheus_cadvisor_repository_version %} ENV prometheus_cadvisor_version=0.27.4 {% endblock %} +{% if base_arch in ['x86_64'] %} + {% block prometheus_cadvisor_install %} -RUN curl -ssL -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor \ - && chmod 755 /opt/cadvisor +RUN curl -ssL -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor && chmod 0755 /opt/cadvisor {% endblock %} +{% else %} + + {% if base_distro in ['debian'] %} + + {% set cadvisor_packages = [ + 'libjs-bootstrap', + 'libjs-jquery', + 'http://snapshot.debian.org/archive/debian/20180503T060640Z/pool/main/c/cadvisor/cadvisor_0.27.1+dfsg2-1_arm64.deb' + ] %} + + {{ macros.install_packages(cadvisor_packages | customizable("packages")) }} +RUN ln -s /usr/bin/cadvisor /opt/cadvisor + {% endif %} + +{% endif %} + {% block prometheus_cadvisor_footer %}{% endblock %} {% block footer %}{% endblock %} |