diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-07-02 19:59:44 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-07-05 05:49:13 +0000 |
| commit | 3f79e37d21f7bda40656da2d9607cb4fe0c2c69a (patch) | |
| tree | 23d8e75f1501af5dff0dee8208d31881c44b9e3f /docker/swift | |
| parent | 10258f138b283a3c3dc3c873a3aa8149308f1ee7 (diff) | |
| download | kolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.tar.gz kolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.zip | |
Fix the overwrite sudoers file issue
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98
Closes-Bug: #1598423
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
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 |