Browse Source

kibana/debian: use upstream package on all architectures

Upstream kibana package ships x86_64 binaries of NodeJS. I usually
repacked package without them to have something for other architectures.

Instead let us install upstream. Then on non-x86 archs we add nodejs
from distribution and remove x86-64 binaries.

Change-Id: Ia9feac726a60250215b1bc78bf90dc68ac6f956a
changes/12/718612/6
Marcin Juszkiewicz 2 years ago
parent
commit
345f0555bc
  1. 2
      doc/source/matrix_aarch64.csv
  2. 10
      docker/base/apt_preferences.debian
  3. 14
      docker/kibana/Dockerfile.j2
  4. 1
      kolla/image/build.py
  5. 3
      kolla/template/repos.yaml

2
doc/source/matrix_aarch64.csv

@ -36,7 +36,7 @@ kafka,C,C,C,C,N,C
karbor,N,C,N,C,N,C
keepalived,C,C,C,C,N,C
keystone,C,C,C,C,N,C
kibana,N,N,N,N,N,N
kibana,N,N,N,N,C,C
kolla-toolbox,C,C,C,C,N,C
kuryr,N,C,N,C,N,C
logstash,C,C,C,C,N,C

1 Image,CentOS,,Ubuntu,,Debian
36 karbor,N,C,N,C,N,C
37 keepalived,C,C,C,C,N,C
38 keystone,C,C,C,C,N,C
39 kibana,N,N,N,N,N,N kibana,N,N,N,N,C,C
40 kolla-toolbox,C,C,C,C,N,C
41 kuryr,N,C,N,C,N,C
42 logstash,C,C,C,C,N,C

10
docker/base/apt_preferences.debian

@ -22,16 +22,6 @@ Package: *
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
Pin-Priority: 100
# Unless it is kibana (on aarch64)
Package: kibana kibana-oss
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
Pin-Priority: 600
# on x86-64 use upstream package for kibana
Package: kibana kibana-oss
Pin: release o=elastic,b=amd64
Pin-Priority: 700
# We need fixed libvirt for aarch64
Package: *libvirt*
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster

14
docker/kibana/Dockerfile.j2

@ -11,9 +11,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='kibana') }}
# NOTE(hrw): upstream package ships x86_64 binaries for NodeJS. On other
# architectures we install NodeJS from distro and remove binaries.
{% if base_arch != 'x86_64' and base_distro in ['debian'] %}
RUN dpkg --add-architecture amd64 && \
{{ macros.install_packages(['nodejs', 'kibana-oss:amd64'], chain=True) }} \
&& rm -rf /usr/share/kibana/node
{% else %}
{% set kibana_packages = ['kibana-oss'] %}
{{ macros.install_packages(kibana_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

1
kolla/image/build.py

@ -165,6 +165,7 @@ UNBUILDABLE_IMAGES = {
},
'ubuntu+aarch64': {
"kibana", # no binary package
"sensu-base", # no binary package
},

3
kolla/template/repos.yaml

@ -57,7 +57,7 @@ debian-aarch64:
erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian buster stable"
kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
@ -79,7 +79,6 @@ ubuntu-aarch64:
erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"

Loading…
Cancel
Save