diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-09-26 15:33:54 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-09-27 18:45:31 +0200 |
| commit | 1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a (patch) | |
| tree | e5db5c01172afc8dbdc750dae95b042b6fc43b10 /docker/grafana | |
| parent | 92da071d9da8476c74ecb16e43e71b276744a863 (diff) | |
| download | kolla-1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a.tar.gz kolla-1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a.zip | |
grafana: on aarch64 use 5.2.4 version from upstream
Upstream started building Grafana for arm64 a while ago. So let's use it
instead of someone's build.
Change-Id: Ia5359cd86022f2475301407d62a5ad4e1b275c13
Diffstat (limited to 'docker/grafana')
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index fa967f0de..504a23563 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -5,16 +5,34 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{% set grafana_packages = ['grafana'] %} + {% if base_arch not in ['aarch64', 'x86_64'] %} RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \ && /bin/false +{% elif base_arch in ['aarch64'] %} + + {% if base_distro in ['centos'] %} + + {% set grafana_packages = [ + 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.4-1.aarch64.rpm' + ] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + + {% set grafana_packages = [ + 'libfontconfig', + 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.2.4_arm64.deb' + ] %} + + {% endif %} + {% endif %} {{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }} -{% set grafana_packages = ['grafana'] %} {{ macros.install_packages(grafana_packages | customizable("packages")) }} WORKDIR /usr/share/grafana |