4 files changed, 5 insertions, 11 deletions
diff --git a/docker_templates/magnum/magnum-api/build b/docker_templates/magnum/magnum-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/magnum/magnum-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
-\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-base/Dockerfile.j2 b/docker_templates/magnum/magnum-base/Dockerfile.j2
index b955329f0..59c22f57e 100644
--- a/docker_templates/magnum/magnum-base/Dockerfile.j2
+++ b/docker_templates/magnum/magnum-base/Dockerfile.j2
@@ -18,15 +18,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     {% endif %}
 {% elif install_type == 'source' %}
 
-ADD ./magnum.tar /
-RUN ln -s /magnum-* /magnum
-
-RUN cd /magnum \
+ADD magnum.tar /
+RUN ln -s /magnum-* magnum \
     && useradd --user-group magnum \
-    && pip install -r requirements.txt \
-    && pip install /magnum \
-    && mkdir /etc/magnum /var/log/magnum \
+    && pip --no-cache-dir install /magnum \
+    && mkdir -p /etc/magnum /var/log/magnum /home/magnum \
     && cp -r /magnum/etc/* /etc/magnum/ \
-    && rm -rf /root/.cache
+    && chown -R magnum: /etc/magnum /var/log/magnum /home/magnum
 
 {% endif %}
diff --git a/docker_templates/magnum/magnum-base/build b/docker_templates/magnum/magnum-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
-\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-conductor/build b/docker_templates/magnum/magnum-conductor/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/magnum/magnum-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
-\ No newline at end of file