diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-01 17:00:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-01 17:00:13 +0000 |
| commit | d1dbb2440e946ae1b4517cf22f9477c095ff4e18 (patch) | |
| tree | 11f300c91dd796a27705e0a06e54f147b3e2cacb /docker | |
| parent | 962913af8edb82247e167fbd8b11104c71c4e98a (diff) | |
| parent | 40efebd61f33e7058c1ee5d13ccf44266e047230 (diff) | |
| download | kolla-d1dbb2440e946ae1b4517cf22f9477c095ff4e18.tar.gz kolla-d1dbb2440e946ae1b4517cf22f9477c095ff4e18.zip | |
Merge "Fix swift dockerfile"
Diffstat (limited to 'docker')
| -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 %} |