diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 15:49:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 15:49:57 +0000 |
| commit | b1eef791c9cd3793e6db19fce4b5c406c56b57dd (patch) | |
| tree | 1507b3d0f25adae4c2a77cba2278311f37f681bf | |
| parent | 48c7fd4bc96abf713fbfead95a4e68f4bf0fa48a (diff) | |
| parent | 8594c78a0a1d78011893e78ea16be33f73b7f60b (diff) | |
| download | kolla-b1eef791c9cd3793e6db19fce4b5c406c56b57dd.tar.gz kolla-b1eef791c9cd3793e6db19fce4b5c406c56b57dd.zip | |
Merge "Unify Centos and Ubuntu Source Install - Gnocchi"
| -rw-r--r-- | docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 index 49cf68efb..be8840073 100644 --- a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 @@ -14,16 +14,12 @@ RUN apt-get install -y --no-install-recommends libpq-dev \ {% endif %} -ADD ./gnocchi.tar / -RUN ln -s /gnocchi-* /gnocchi - -RUN cd /gnocchi \ +ADD gnocchi.tar / +RUN ln -s /gnocchi-* gnocchi \ && useradd --user-group gnocchi \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /gnocchi \ + && pip --no-cache-dir install /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 + && chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi {% endif %} |