grafana/aarch64: use package from upstream repositories

We were installing 5.2.4 version instead of just latest one like it is
done on x86-64.

Change-Id: If8434c6c05e415ac8d601260d02b25facbdef1f5
This commit is contained in:
Marcin Juszkiewicz 2019-05-31 12:21:08 +02:00
parent 498c57fcac
commit 1e7a78932d
4 changed files with 11 additions and 17 deletions

View File

@ -102,6 +102,11 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
'ceph.repo',
'grafana.repo'
] %}
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
] %}
{% endif %}

View File

@ -11,3 +11,6 @@ deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
# main docker repo
deb https://download.docker.com/linux/debian buster stable
# Grafana repo
deb https://packages.grafana.com/oss/deb stable main

View File

@ -12,3 +12,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/stein main
# rabbitmq repo
deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
# Grafana repo
deb https://packages.grafana.com/oss/deb stable main

View File

@ -12,23 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \
&& /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_package_type == 'deb' %}
{% set grafana_packages = [
'libfontconfig',
'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.2.4_arm64.deb'
] %}
{% endif %}
{% endif %}
{{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }}