From 1e7a78932dc0461c60d9fd6e613b252d8b22ff01 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 31 May 2019 12:21:08 +0200
Subject: [PATCH] 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
---
 docker/base/Dockerfile.j2               |  5 +++++
 docker/base/sources.list.debian         |  3 +++
 docker/base/sources.list.ubuntu.aarch64 |  3 +++
 docker/grafana/Dockerfile.j2            | 17 -----------------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b61a6a989e..b53934666e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -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 %}
 
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index 48e2e7137e..12554eb477 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -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
diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64
index dae4b688ec..e7da28a7af 100644
--- a/docker/base/sources.list.ubuntu.aarch64
+++ b/docker/base/sources.list.ubuntu.aarch64
@@ -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
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index a978e92e5d..9911092afb 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/docker/grafana/Dockerfile.j2
@@ -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') }}