Merge "Bump up cAdvisor's version"

This commit is contained in:
Zuul 2021-07-02 15:59:56 +00:00 committed by Gerrit Code Review
commit 5e0b238b01
2 changed files with 11 additions and 3 deletions

View File

@ -8,13 +8,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% block prometheus_cadvisor_repository_version %}
ENV prometheus_cadvisor_version=0.35.0
ENV prometheus_cadvisor_version=0.38.7
ENV prometheus_cadvisor_sha256sum=fdb86c256df682cfec2abd57a4405c919ed26f1e27ebfabf487f6c516bc7f6c7
{% endblock %}
{% if base_arch in ['x86_64'] %}
{% block prometheus_cadvisor_install %}
RUN curl -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor && chmod 0755 /opt/cadvisor
RUN curl -o /tmp/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor \
&& echo "${prometheus_cadvisor_sha256sum} /tmp/cadvisor" | sha256sum -c \
&& mv /tmp/cadvisor /opt \
&& chmod 0755 /opt/cadvisor
{% endblock %}
{% else %}
@ -24,7 +28,7 @@ RUN curl -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v
{% set cadvisor_packages = [
'libjs-bootstrap',
'libjs-jquery',
'https://snapshot.debian.org/archive/debian/20180503T060640Z/pool/main/c/cadvisor/cadvisor_0.27.1+dfsg2-1_arm64.deb'
'cadvisor'
] %}
{{ macros.install_packages(cadvisor_packages | customizable("packages")) }}

View File

@ -0,0 +1,4 @@
---
features:
- |
cAdvisor has been updated to 0.38.7 version.