diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-02-14 09:00:57 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-02-14 09:01:01 +0000 |
| commit | b050ef63e81c5fdc210b0e99298b2738bad6b5d2 (patch) | |
| tree | 2f7d0a12805bbb656e07dd14ef5bc299c1dec377 | |
| parent | 063a46a7de4471504535499ca2a972a79e4ce5e5 (diff) | |
| download | kolla-b050ef63e81c5fdc210b0e99298b2738bad6b5d2.tar.gz kolla-b050ef63e81c5fdc210b0e99298b2738bad6b5d2.zip | |
kibana: enable for non-x86 on Debian/Ubuntu
As upstream generated 'all' package as 'amd64' one I took some time and
repackaged it.
Change-Id: Ie84ed771ffa9ecd70b945673727895c8edad30eb
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 9 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 52dc1085a..4845958c0 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -9,7 +9,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 diff --git a/kolla/image/build.py b/kolla/image/build.py index f3fd56038..f662293fd 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -84,7 +84,6 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR, UNBUILDABLE_IMAGES = { 'aarch64': { "cyborg-base", # no binary package - "kibana", # no binary package "monasca-grafana", # no phantomJS on aarch64 "opendaylight", # no binary package "prometheus-mtail", # no aarch64 binary @@ -95,7 +94,6 @@ UNBUILDABLE_IMAGES = { "cyborg-base", # no binary package "elasticsearch", # no binary package "grafana", # no binary package - "kibana", # no binary package "monasca-grafana", # no phantomJS "opendaylight", # no binary package "prometheus-base", # no ppc64le binaries @@ -195,6 +193,7 @@ UNBUILDABLE_IMAGES = { "elasticsearch", # no binary package "hacluster-pcs", # no binary package "influxdb", # no binary package + "kibana", # no binary package "mongodb", # no binary package "telegraf", # no binary package }, @@ -202,6 +201,7 @@ UNBUILDABLE_IMAGES = { 'centos+ppc64le': { "hacluster-pcs", # no binary package "influxdb", # no binary package + "kibana", # no binary package "mongodb", # no binary package }, |