diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-17 16:09:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-17 16:09:06 +0000 |
| commit | b07241ff5537e6f3807943c1bb9bc26a9badc7aa (patch) | |
| tree | 504ed829f2eda81ba427efe45e49967905e34c8b | |
| parent | 45ef7176aead8d8b59135f8c168094600ea05f31 (diff) | |
| parent | 1e7a78932dc0461c60d9fd6e613b252d8b22ff01 (diff) | |
| download | kolla-b07241ff5537e6f3807943c1bb9bc26a9badc7aa.tar.gz kolla-b07241ff5537e6f3807943c1bb9bc26a9badc7aa.zip | |
Merge "grafana/aarch64: use package from upstream repositories"
| -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 | ||||
| -rw-r--r-- | 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 fda528330..d7048f076 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -97,6 +97,11 @@ COPY yum.conf /etc/yum.conf {% 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 diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index a978e92e5..9911092af 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') }} |