aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-27 10:38:24 +0000
committerSam Yaple <sam@yaple.net>2015-08-27 11:15:48 +0000
commit8ba0faf6337b50696862c0b712e1deb6441555e5 (patch)
treefd3a2a859d9d6074b09afdca2b421250b0305542
parenteecf6581a47745d53298c4efa5af6c411afa6260 (diff)
downloadkolla-8ba0faf6337b50696862c0b712e1deb6441555e5.tar.gz
kolla-8ba0faf6337b50696862c0b712e1deb6441555e5.zip
Unify Centos and Ubuntu Source Install - Swift
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: Ie6f81d4d1ce8e6d8bc830f0af3c684671df5545f Partially-Implements: blueprint install-from-ubuntu
-rw-r--r--docker_templates/swift/swift-base/Dockerfile.j213
1 files changed, 5 insertions, 8 deletions
diff --git a/docker_templates/swift/swift-base/Dockerfile.j2 b/docker_templates/swift/swift-base/Dockerfile.j2
index eee2324d0..7102916f1 100644
--- a/docker_templates/swift/swift-base/Dockerfile.j2
+++ b/docker_templates/swift/swift-base/Dockerfile.j2
@@ -15,16 +15,13 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
-ADD ./swift.tar /
-RUN ln -s /swift-* /swift
-
-RUN cd /swift \
+ADD swift.tar /
+RUN ln -s /swift-* swift \
&& useradd --user-group swift \
- && pip install -r requirements.txt \
- && pip install /swift \
- && mkdir /etc/swift /var/log/swift \
+ && pip --no-cache-dir install /swift \
+ && mkdir -p /etc/swift /var/log/swift /home/swift \
&& cp -r /swift/etc/* /etc/swift/ \
- && rm -rf /root/.cache
+ && chown -R swift: /etc/swift /var/log/swift /home/swift
{% endif %}