openstack/kolla
Code Issues Proposed changes

grafana: on aarch64 use 5.2.4 version from upstream

Browse Source 
Upstream started building Grafana for arm64 a while ago. So let's use it
instead of someone's build.

Change-Id: Ia5359cd86022f2475301407d62a5ad4e1b275c13
This commit is contained in:
Marcin Juszkiewicz 2018-09-26 15:33:54 +01:00
parent 92da071d9d
commit 1367a1f35d
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -341,7 +341,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
] %} ] %}
{% set remote_apt_keys = [ {% set remote_apt_keys = [
'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key',
'https://bintray.com/user/downloadSubjectPublicKey?username=bintray',
'https://download.docker.com/linux/debian/gpg', 'https://download.docker.com/linux/debian/gpg',
'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
] %} ] %}

3
docker/base/sources.list.debian
View File

@ -10,9 +10,6 @@ deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./
deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main
# Unofficial repository for grafana (LP: #1768585).
deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main
# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64) # elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main

20
docker/grafana/Dockerfile.j2
View File

@ -5,16 +5,34 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% set grafana_packages = ['grafana'] %}
{% if base_arch not in ['aarch64', 'x86_64'] %} {% if base_arch not in ['aarch64', 'x86_64'] %}
RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \ RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \
&& /bin/false && /bin/false
{% elif base_arch in ['aarch64'] %}
{% if base_distro in ['centos'] %}
{% set grafana_packages = [
'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.4-1.aarch64.rpm'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set grafana_packages = [
'libfontconfig',
'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.2.4_arm64.deb'
] %}
{% endif %}
{% endif %} {% endif %}
{{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }} {{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }}
{% set grafana_packages = ['grafana'] %}
{{ macros.install_packages(grafana_packages | customizable("packages")) }} {{ macros.install_packages(grafana_packages | customizable("packages")) }}
WORKDIR /usr/share/grafana WORKDIR /usr/share/grafana