diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-17 10:52:24 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-06-01 08:31:00 +0000 |
| commit | 5026e976e65445fd282502fa3519690caa63ad56 (patch) | |
| tree | 203e1021d43942210908cf84ccd3ff0651862797 /docker | |
| parent | 40cd7550dd261f5d16ecded56c8bd8e0434e18da (diff) | |
| download | kolla-5026e976e65445fd282502fa3519690caa63ad56.tar.gz kolla-5026e976e65445fd282502fa3519690caa63ad56.zip | |
Updated Gnocchi binary containers
Added ubuntu binary containers
Added gnocchi-metricd which is new package in centos
and ubuntu
Change-Id: If21d705e8bd1e34ea894c83ae42b0c8ef20510d7
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582523
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 22 |
3 files changed, 36 insertions, 1 deletions
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 2d66e5e4d..995cdeaca 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -10,6 +10,12 @@ RUN yum -y install \ openstack-gnocchi-indexer-sqlalchemy \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + gnocchi-api \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index f478ae5a2..650b06b13 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -8,11 +8,18 @@ RUN yum -y install \ openstack-gnocchi-common \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + gnocchi-common \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['ubuntu', 'debian'] %} -RUN apt-get -y install --no-install-recommends libpq-dev \ +RUN apt-get -y install --no-install-recommends \ + libpq-dev \ && apt-get clean {% endif %} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 new file mode 100644 index 000000000..d4ac00ad1 --- /dev/null +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -0,0 +1,22 @@ +FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + openstack-gnocchi-metricd \ + && yum clean all + + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + gnocchi-metricd \ + && apt-get clean + + {% endif %} +{% endif %} + +{{ include_footer }} + +USER gnocchi |