diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 15:53:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 15:53:29 +0000 |
| commit | 12a21ed6efb2254314888c591bfbe86ad4e0c725 (patch) | |
| tree | febfb798cde853a8926761b8b090c1c4d7669b3e | |
| parent | 28ec0374181386073b697561d4134487eb3e3320 (diff) | |
| parent | 91179029461b5a33a1de6cca286a1e2c806fbf23 (diff) | |
| download | kolla-12a21ed6efb2254314888c591bfbe86ad4e0c725.tar.gz kolla-12a21ed6efb2254314888c591bfbe86ad4e0c725.zip | |
Merge "Unify Centos and Ubuntu Source Install - Heat"
| -rw-r--r-- | docker_templates/heat/heat-base/Dockerfile.j2 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker_templates/heat/heat-base/Dockerfile.j2 index 858148f31..408167e90 100644 --- a/docker_templates/heat/heat-base/Dockerfile.j2 +++ b/docker_templates/heat/heat-base/Dockerfile.j2 @@ -16,15 +16,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ./heat.tar / -RUN ln -s /heat-* /heat - -RUN cd /heat \ +ADD heat.tar / +RUN ln -s /heat-* heat \ && useradd --user-group heat \ - && pip install -r requirements.txt \ - && pip install /heat \ - && mkdir /etc/heat /var/log/heat \ + && pip --no-cache-dir install /heat \ + && mkdir -p /etc/heat /var/log/heat /home/heat \ && cp -r /heat/etc/heat/* /etc/heat/ \ - && rm -rf /root/.cache + && chown -R heat: /etc/heat /var/log/heat /home/heat {% endif %} |