diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 10:29:59 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:30:10 +0000 |
| commit | 8594c78a0a1d78011893e78ea16be33f73b7f60b (patch) | |
| tree | 3689ad2bd3067d3f156fb6b28b12fbf481d5ca7e | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-8594c78a0a1d78011893e78ea16be33f73b7f60b.tar.gz kolla-8594c78a0a1d78011893e78ea16be33f73b7f60b.zip | |
Unify Centos and Ubuntu Source Install - Gnocchi
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.
Change-Id: Id7c2160f63ad860168b4293a29c1db24f066fc3f
Partially-Implements: blueprint install-from-ubuntu
| -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 %} |