diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 19:45:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 19:45:00 +0000 |
| commit | deab6136698aa1de9359c548faed84e019a98824 (patch) | |
| tree | 381ea104be0c7bef08f08180405e55a376bac75b | |
| parent | 1d2ee08a4731306b9ce068bd948d85d0acdbe2d4 (diff) | |
| parent | 033d437bf945e5e4f910c83d620ab1392d5b6739 (diff) | |
| download | kolla-deab6136698aa1de9359c548faed84e019a98824.tar.gz kolla-deab6136698aa1de9359c548faed84e019a98824.zip | |
Merge "Make heat build from source in the templates"
| -rw-r--r-- | docker_templates/heat/heat-base/Dockerfile.j2 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker_templates/heat/heat-base/Dockerfile.j2 index bd84be5ba..858148f31 100644 --- a/docker_templates/heat/heat-base/Dockerfile.j2 +++ b/docker_templates/heat/heat-base/Dockerfile.j2 @@ -23,9 +23,8 @@ RUN cd /heat \ && useradd --user-group heat \ && pip install -r requirements.txt \ && pip install /heat \ - && mkdir /etc/heat /var/www/cgi-bin/heat \ - && cp -r /heat/etc/* /etc/heat/ \ - && cp -a httpd/heat.py /var/www/cgi-bin/heat/admin \ - && cp -a httpd/heat.py /var/www/cgi-bin/heat/main + && mkdir /etc/heat /var/log/heat \ + && cp -r /heat/etc/heat/* /etc/heat/ \ + && rm -rf /root/.cache {% endif %} |