diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 15:49:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 15:49:38 +0000 |
| commit | 48c7fd4bc96abf713fbfead95a4e68f4bf0fa48a (patch) | |
| tree | 0e0ef1396455d28af0cd5b4344e4ff3b35c4043c | |
| parent | 91ecc598757fa9a96c1dca1ecf1939ae7adc93d9 (diff) | |
| parent | bd98a508bdea32411ac9685bd26d8642154cebd5 (diff) | |
| download | kolla-48c7fd4bc96abf713fbfead95a4e68f4bf0fa48a.tar.gz kolla-48c7fd4bc96abf713fbfead95a4e68f4bf0fa48a.zip | |
Merge "Unify Centos and Ubuntu Source Install - Nova"
| -rw-r--r-- | docker_templates/nova/nova-base/Dockerfile.j2 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2 index 8e117e69e..b46a446d4 100644 --- a/docker_templates/nova/nova-base/Dockerfile.j2 +++ b/docker_templates/nova/nova-base/Dockerfile.j2 @@ -39,16 +39,12 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD ./nova.tar / -RUN ln -s /nova-* /nova - -RUN cd /nova \ +ADD nova.tar / +RUN ln -s /nova-* nova \ && useradd --user-group nova \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /nova \ - && mkdir /etc/nova /var/log/nova /home/nova \ + && pip --no-cache-dir install /nova \ + && mkdir -p /etc/nova /var/log/nova /home/nova \ && cp -r /nova/etc/nova/* /etc/nova/ \ - && chown -R nova: /etc/nova /var/log/nova /home/nova \ - && rm -rf /root/.cache + && chown -R nova: /etc/nova /var/log/nova /home/nova {% endif %} |