diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-02-14 09:00:57 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-03-12 15:34:57 +0000 |
| commit | 331b3903b9b1177fdadd0ae6ad6f14282a85dd71 (patch) | |
| tree | f4bfcb5323bbdd32687f3556fd8522f56855481e /docker | |
| parent | ca8b61516401d61d90e2940fa130c8f55a8b6e45 (diff) | |
| download | kolla-331b3903b9b1177fdadd0ae6ad6f14282a85dd71.tar.gz kolla-331b3903b9b1177fdadd0ae6ad6f14282a85dd71.zip | |
kibana: enable for non-x86 on Debian/Ubuntu
As upstream generated 'all' package as 'amd64' one I took some time and
repackaged it.
manual cherry-pick from https://review.opendev.org/#/c/707787/
Change-Id: Ie84ed771ffa9ecd70b945673727895c8edad30eb
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index d0d3068de..cbe1d454c 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -7,7 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kibana') }} -{% set kibana_packages = ['kibana'] %} +{% if base_arch != 'x86_64' and base_distro in ['debian', 'ubuntu'] %} + {% set kibana_packages = [ + 'nodejs', + 'http://obs.linaro.org/home:/marcin.juszkiewicz/debian-buster/all/kibana_5.6.16-0linaro1_all.deb' + ] %} +{% else %} + {% set kibana_packages = ['kibana'] %} +{% endif %} {{ macros.install_packages(kibana_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start |