diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 13:04:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 13:04:29 +0000 |
| commit | e3312a58e5d9cd21dbad36fb892172ee3051cd12 (patch) | |
| tree | a37146f63d59a1d56a1ef7ab1d19b4e4149372cd /docker | |
| parent | 139e0dd094314635e2add16fe1829801164f243e (diff) | |
| parent | f0aaa45fd7932508bcee3311a34b632433502a4a (diff) | |
| download | kolla-e3312a58e5d9cd21dbad36fb892172ee3051cd12.tar.gz kolla-e3312a58e5d9cd21dbad36fb892172ee3051cd12.zip | |
Merge "grafana: disable for non-x86"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index 8678a3923..cc62e329f 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -5,6 +5,13 @@ LABEL maintainer="{{ maintainer }}" {% import "macros.j2" as macros with context %} +{% if base_arch != 'x86_64' %} + +RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \ + && /bin/false + +{% endif %} + {{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }} {% set grafana_packages = ['grafana'] %} |