From 345f0555bcae10056b0ef6a79d32cc124f07d5a2 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 9 Apr 2020 08:10:33 +0000
Subject: 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
---
 docker/base/apt_preferences.debian | 10 ----------
 docker/kibana/Dockerfile.j2        | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'docker')

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
 
-- 
cgit v1.2.3