From 033d437bf945e5e4f910c83d620ab1392d5b6739 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 16 Aug 2015 09:09:21 -0700
Subject: [PATCH] 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
---
docker_templates/heat/heat-base/Dockerfile.j2 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker_templates/heat/heat-base/Dockerfile.j2
index bd84be5baf..858148f31c 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 %}