diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-09-26 15:33:54 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-09-27 18:45:31 +0200 |
| commit | 1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a (patch) | |
| tree | e5db5c01172afc8dbdc750dae95b042b6fc43b10 /docker/base | |
| parent | 92da071d9da8476c74ecb16e43e71b276744a863 (diff) | |
| download | kolla-1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a.tar.gz kolla-1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a.zip | |
grafana: on aarch64 use 5.2.4 version from upstream
Upstream started building Grafana for arm64 a while ago. So let's use it
instead of someone's build.
Change-Id: Ia5359cd86022f2475301407d62a5ad4e1b275c13
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3710a1063..df1141167 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -341,7 +341,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences ] %} {% set remote_apt_keys = [ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', - 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray', 'https://download.docker.com/linux/debian/gpg', 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' ] %} diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index da74a7dc3..44476cef8 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -10,9 +10,6 @@ deb http://obs.linaro.org/ERP:/18.06/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 - # elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64) deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main |