diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-05 11:32:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-05 11:32:18 +0000 |
| commit | ece1595081238ecbe114f02942265c9db87a0b17 (patch) | |
| tree | 9d029065abafd00debaffc5cedb345414377ed40 /docker/gnocchi/gnocchi-api | |
| parent | e61cc1a2a57a55a082ba978f2794e633afb66e16 (diff) | |
| parent | f7e18cab31340c6934ab378f5483d2c84e761d10 (diff) | |
| download | kolla-ece1595081238ecbe114f02942265c9db87a0b17.tar.gz kolla-ece1595081238ecbe114f02942265c9db87a0b17.zip | |
Merge "Customizations for gnocchi"
Diffstat (limited to 'docker/gnocchi/gnocchi-api')
| -rw-r--r-- | docker/gnocchi/gnocchi-api/Dockerfile.j2 | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 995cdeaca..6c4ac2530 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -1,27 +1,25 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-gnocchi-api \ - openstack-gnocchi-carbonara \ - openstack-gnocchi-indexer-sqlalchemy \ - && yum clean all - + {% set gnocchi_api_packages = [ + 'openstack-gnocchi-api', + 'openstack-gnocchi-carbonara', + 'openstack-gnocchi-indexer-sqlalchemy' + ] %} {% elif base_distro in ['ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - gnocchi-api \ - && apt-get clean - + {% set gnocchi_api_packages = ['gnocchi-api'] %} {% endif %} +RUN {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }} {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start +RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start +{% block gnocchi_api_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER gnocchi |
