diff options
| author | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-27 15:01:05 +0000 |
|---|---|---|
| committer | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-28 08:35:22 +0000 |
| commit | 40efebd61f33e7058c1ee5d13ccf44266e047230 (patch) | |
| tree | d920b3d47a1afce943c650dbdf47e8ed121b815f | |
| parent | 32a7b22de70d93b44c7f09dcf3c73199c3cc0fec (diff) | |
| download | kolla-40efebd61f33e7058c1ee5d13ccf44266e047230.tar.gz kolla-40efebd61f33e7058c1ee5d13ccf44266e047230.zip | |
Fix swift dockerfile
* remove /var/log/swift
* fix code format
Change-Id: If10e668ed612df76c91e54947cf11910f7f1c707
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index dfad2157d..fa322999f 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -33,22 +33,21 @@ MAINTAINER {{ maintainer }} ADD swift-base-archive /swift-base-source RUN ln -s swift-base-source/* swift \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /swift \ - && mkdir -p /etc/swift /var/cache/swift /var/log/swift \ + && mkdir -p /etc/swift /var/cache/swift \ && cp -r /swift/etc/* /etc/swift/ \ - && chown -R swift: /etc/swift /var/cache/swift /var/log/swift + && chown -R swift: /etc/swift /var/cache/swift {% endif %} COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap COPY rootwrap.conf /etc/swift/rootwrap.conf -RUN chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \ - && chmod 644 /etc/swift/rootwrap.conf \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/swift/rootwrap.conf - COPY swift_sudoers /etc/sudoers.d/kolla_swift_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_swift_sudoers - COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring -RUN mkdir -p /opt/swift + +RUN chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \ + && chmod 644 /etc/swift/rootwrap.conf \ + && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/swift/rootwrap.conf \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_swift_sudoers \ + && mkdir -p /opt/swift {% block swift_base_footer %}{% endblock %} |