From abcc7d1731609d71cff03a058e899316010d8759 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 10:28:31 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Designate

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: I83b0d2ca2735b0b6b0b94d67f4ab301b92ef1e0a
Partially-Implements: blueprint install-from-ubuntu
---
 .../designate/designate-base/Dockerfile.j2          | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker_templates/designate/designate-base/Dockerfile.j2 b/docker_templates/designate/designate-base/Dockerfile.j2
index 4aa05f47c7..3fec3a6f73 100644
--- a/docker_templates/designate/designate-base/Dockerfile.j2
+++ b/docker_templates/designate/designate-base/Dockerfile.j2
@@ -26,15 +26,12 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
     {% endif %}
 {% elif install_type == 'source' %}
 
-ADD ./designate.tar /
-RUN ln -s /designate-* /designate
-
-RUN cd /designate \
+ADD designate.tar /
+RUN ln -s /designate-* designate \
     && useradd --user-group designate \
-    && pip install -r requirements.txt \
-    && pip install /designate \
-    && mkdir /etc/designate /var/log/designate \
+    && pip --no-cache-dir install /designate \
+    && mkdir -p /etc/designate /var/log/designate /home/designate \
     && cp -r /designate/etc/designate/* /etc/designate/ \
-    && rm -rf /root/.cache
+    && chown -R designate: /etc/designate /var/log/designate /home/designate
 
 {% endif %}