From 3f79e37d21f7bda40656da2d9607cb4fe0c2c69a Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Sat, 2 Jul 2016 19:59:44 +0800 Subject: Fix the overwrite sudoers file issue Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98 Closes-Bug: #1598423 --- docker/swift/swift-base/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 1762e09d3..2e05ac29f 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -48,9 +48,9 @@ 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/swift_sudoers +COPY swift_sudoers /etc/sudoers.d/kolla_swift_sudoers RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/swift_sudoers + && 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 -- cgit v1.2.3