diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-05-31 12:21:08 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-06-07 17:54:13 +0200 |
| commit | 1e7a78932dc0461c60d9fd6e613b252d8b22ff01 (patch) | |
| tree | c9bb0d8a218f29c0a16f1186591cabacac6b51cf /docker/base | |
| parent | 498c57fcac31da9268918ec6c188fe2aae0c4906 (diff) | |
| download | kolla-1e7a78932dc0461c60d9fd6e613b252d8b22ff01.tar.gz kolla-1e7a78932dc0461c60d9fd6e613b252d8b22ff01.zip | |
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
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.aarch64 | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b61a6a989..b53934666 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 48e2e7137..12554eb47 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 dae4b688e..e7da28a7a 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 |