aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-16 09:09:21 -0700
committerSteven Dake <stdake@cisco.com>2015-08-17 10:06:08 -0700
commit033d437bf945e5e4f910c83d620ab1392d5b6739 (patch)
tree29bba0fdc40992ca7db352e39d3d7484decc6b50
parent91026e78bf8bd6a50d5b7828e441ac108dcb8941 (diff)
downloadkolla-033d437bf945e5e4f910c83d620ab1392d5b6739.tar.gz
kolla-033d437bf945e5e4f910c83d620ab1392d5b6739.zip
Make heat build from source in the templates
There was an error during docker-templates for heat. I think I copied keystone's example rather then looking at our from source reference. Change-Id: Id073ce0b0d9e72acb3b752f49a2b8cfcd5d51851 Partially Implements: blueprint docker-templates
-rw-r--r--docker_templates/heat/heat-base/Dockerfile.j27
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 %}