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:
@@ -102,6 +102,11 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
|
|||||||
{% elif base_arch == 'aarch64' %}
|
{% elif base_arch == 'aarch64' %}
|
||||||
{% set base_yum_repo_files = [
|
{% set base_yum_repo_files = [
|
||||||
'ceph.repo',
|
'ceph.repo',
|
||||||
|
'grafana.repo'
|
||||||
|
] %}
|
||||||
|
|
||||||
|
{% set base_yum_repo_keys = [
|
||||||
|
'https://packages.grafana.com/gpg.key',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@@ -11,3 +11,6 @@ deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
|
|||||||
|
|
||||||
# main docker repo
|
# main docker repo
|
||||||
deb https://download.docker.com/linux/debian buster stable
|
deb https://download.docker.com/linux/debian buster stable
|
||||||
|
|
||||||
|
# Grafana repo
|
||||||
|
deb https://packages.grafana.com/oss/deb stable main
|
||||||
|
@@ -12,3 +12,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/stein main
|
|||||||
|
|
||||||
# rabbitmq repo
|
# rabbitmq repo
|
||||||
deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
|
deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
|
||||||
|
|
||||||
|
# Grafana repo
|
||||||
|
deb https://packages.grafana.com/oss/deb stable main
|
||||||
|
@@ -12,23 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
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_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 %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }}
|
{{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }}
|
||||||
|
Reference in New Issue
Block a user