diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-04 12:41:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-04 12:41:19 +0000 |
| commit | bff8f95b953d5d11bdc95e5f5e28088619e7dfda (patch) | |
| tree | 6a2ffe2839a1be9ffefb0ed0988380d417eb989b /docker/base | |
| parent | 900f9e856e73403b54ed72b97c50ba127cfe6ad8 (diff) | |
| parent | 1367a1f35ddd7447d7bf8f2aa5b319d173f6be1a (diff) | |
| download | kolla-bff8f95b953d5d11bdc95e5f5e28088619e7dfda.tar.gz kolla-bff8f95b953d5d11bdc95e5f5e28088619e7dfda.zip | |
Merge "grafana: on aarch64 use 5.2.4 version from upstream"
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 |