diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-23 10:38:50 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-24 13:35:26 +0000 |
| commit | 73a356e951865d508e4d527ff4a054e8602143b9 (patch) | |
| tree | d7a11878e6a1cdc4efbf0033b49dc0f01582e1d9 | |
| parent | 44aa4af5f538df3a7656dbf2232e5ed882b7993b (diff) | |
| download | kolla-73a356e951865d508e4d527ff4a054e8602143b9.tar.gz kolla-73a356e951865d508e4d527ff4a054e8602143b9.zip | |
Ubuntu - Gnocchi
Change-Id: I3d8ddf5b54d79d66fd74ed85e9cc65b0ce7201c0
Partially-Implements: blueprint install-from-ubuntu
| -rw-r--r-- | docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 index 93d821476..9bb144ed7 100644 --- a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 @@ -4,9 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} -RUN yum install -y openstack-gnocchi-api \ - openstack-gnocchi-carbonara \ - openstack-gnocchi-indexer-sqlalchemy \ +RUN yum install -y \ + openstack-gnocchi-api \ + openstack-gnocchi-carbonara \ + openstack-gnocchi-indexer-sqlalchemy \ && yum clean all {% endif %} diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 index db8220524..49cf68efb 100644 --- a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 @@ -2,13 +2,17 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['ubuntu', 'debian'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false - {% endif %} {% elif install_type == 'source' %} + {% if base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends libpq-dev \ + && apt-get clean + + {% endif %} ADD ./gnocchi.tar / RUN ln -s /gnocchi-* /gnocchi @@ -16,9 +20,10 @@ RUN ln -s /gnocchi-* /gnocchi RUN cd /gnocchi \ && useradd --user-group gnocchi \ && pip install -r requirements.txt \ - && pip install /gnocchi \ - && mkdir /etc/gnocchi /var/log/gnocchi \ + && pip install --install-option="--install-scripts=/usr/bin" /gnocchi \ + && mkdir -p /etc/gnocchi /var/log/gnocchi /home/gnocchi \ && cp -r /gnocchi/etc/* /etc/gnocchi/ \ + && chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi \ && rm -rf /root/.cache {% endif %} |