diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-08 15:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-08 15:20:10 +0000 |
| commit | 4204f29e64c366415e8fea4044b2593f119ea9eb (patch) | |
| tree | c792336ee4b6075b23232607266047751be1e4d5 | |
| parent | c31688be3688d2a4fe24b02aaad7e20ce0a0c516 (diff) | |
| parent | 5026e976e65445fd282502fa3519690caa63ad56 (diff) | |
| download | kolla-4204f29e64c366415e8fea4044b2593f119ea9eb.tar.gz kolla-4204f29e64c366415e8fea4044b2593f119ea9eb.zip | |
Merge "Updated Gnocchi binary containers"
| -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 |