Merge "Unify Centos and Ubuntu Source Install - Cinder"

6 files changed, 5 insertions, 14 deletions

diff --git a/docker_templates/cinder/cinder-api/build b/docker_templates/cinder/cinder-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/cinder/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/cinder/cinder-backup/build b/docker_templates/cinder/cinder-backup/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/cinder/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2
index 34d72b6e1..1cce34a9e 100644
--- a/docker_templates/cinder/cinder-base/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-base/Dockerfile.j2
@@ -33,17 +33,13 @@ RUN apt-get install -y --no-install-recommends lvm2 \
 
     {% endif %}
 
-ADD ./cinder.tar /
-RUN ln -s /cinder-* /cinder
-
-RUN cd /cinder \
+ADD cinder.tar /
+RUN ln -s /cinder-* cinder \
     && useradd --user-group cinder \
-    && pip install -r requirements.txt \
-    && pip install /cinder \
-    && mkdir /etc/cinder /var/log/cinder \
+    && pip --no-cache-dir install /cinder \
+    && mkdir -p /etc/cinder /var/log/cinder /home/cinder \
     && cp -r /cinder/etc/cinder/* /etc/cinder/ \
-    && chown -R cinder: /etc/cinder /var/log/cinder \
-    && rm -rf /root/.cache \
+    && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \
     && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
     && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
 
diff --git a/docker_templates/cinder/cinder-base/build b/docker_templates/cinder/cinder-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/cinder/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/cinder/cinder-scheduler/build b/docker_templates/cinder/cinder-scheduler/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/cinder/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/cinder/cinder-volume/build b/docker_templates/cinder/cinder-volume/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker_templates/cinder/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file