diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 10:31:27 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:16:17 +0000 |
| commit | 91179029461b5a33a1de6cca286a1e2c806fbf23 (patch) | |
| tree | 49050fde22bac91505242b644ce4e0b6dcc0ffca | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-91179029461b5a33a1de6cca286a1e2c806fbf23.tar.gz kolla-91179029461b5a33a1de6cca286a1e2c806fbf23.zip | |
Unify Centos and Ubuntu Source Install - Heat
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: Ieff2fdcbdebc38e381a1cbb92297c89ef412ac03
Partially-Implements: blueprint install-from-ubuntu
| -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 %} |