diff options
| author | Jorge Niedbalski <jorge.niedbalski@linaro.org> | 2018-05-02 15:18:06 -0300 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2018-05-03 16:59:43 +0200 |
| commit | bfa0fe778f2d4305f3ba9017db162af835335fdc (patch) | |
| tree | 0b2e933ee04388f52c72cd676ea753ad1f747496 | |
| parent | e9f6e4cf8c6b3be63911ff1b1a9afaf129729e7b (diff) | |
| download | kolla-bfa0fe778f2d4305f3ba9017db162af835335fdc.tar.gz kolla-bfa0fe778f2d4305f3ba9017db162af835335fdc.zip | |
Add Grafana repository for arm64
Official ARM support as part of the release process of grafana is on
development [0].
For now, the closest official repositories are the ones from fg2it
repository, which is also part of the developers working on the support,
so we are adding it to the sources for now until the official support is
done.
[0] https://github.com/grafana/grafana-docker/issues/117
Bug: #1768585
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
Change-Id: Iba004f99c0ac92cb660e405c5ac9c61dc7fa81e2
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b41749b83..cf1370ec6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -345,6 +345,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences ] %} {% set remote_apt_keys = [ 'https://people.linaro.org/~marcin.juszkiewicz/debian/stretch/Release.key', + 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray', ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 16fc57fad..afc78c4aa 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -12,3 +12,6 @@ deb http://people.linaro.org/~marcin.juszkiewicz/debian/stretch/ ./ deb http://obs.linaro.org/ERP:/kolla/Debian_9/ ./ 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 diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index e33e74bda..fa967f0de 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_arch != 'x86_64' %} +{% if base_arch not in ['aarch64', 'x86_64'] %} RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \ && /bin/false |