diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-19 13:25:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-19 13:25:52 +0000 |
| commit | 26ba50c16f4560bcc3a405650d8f608c31b9df8d (patch) | |
| tree | 5b7c11c612f2c1cfb9116a02a61d51ed947f90fe /docker | |
| parent | b6d152e92dd7a6b59f3b9f248735dacadd26797e (diff) | |
| parent | 345f0555bcae10056b0ef6a79d32cc124f07d5a2 (diff) | |
| download | kolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.tar.gz kolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.zip | |
Merge "kibana/debian: use upstream package on all architectures"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 10 | ||||
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 50aed13c3..b42d817d1 100644 --- a/docker/base/apt_preferences.debian +++ b/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 diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 5d2d250df..2ce191903 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/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 |