diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:30:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:30:19 +0000 |
| commit | fcbee7b27a9d9279c4fc1567ce265892646c6fa2 (patch) | |
| tree | 48c46490fadddb62cbc140624c1ea9ee953d91e8 /docker_templates | |
| parent | c3c28d43f9a9435ecc1798906672583dd424972a (diff) | |
| parent | 8ba0faf6337b50696862c0b712e1deb6441555e5 (diff) | |
| download | kolla-fcbee7b27a9d9279c4fc1567ce265892646c6fa2.tar.gz kolla-fcbee7b27a9d9279c4fc1567ce265892646c6fa2.zip | |
Merge "Unify Centos and Ubuntu Source Install - Swift"
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/swift/swift-base/Dockerfile.j2 | 13 |
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 %} |