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/manila/manila-base/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/manila') diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 893c10ac9..2d6ee3c6b 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -41,9 +41,9 @@ RUN ln -s manila-base-source/* manila \ && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /home/manila \ && 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/manila/rootwrap.conf -COPY manila_sudoers /etc/sudoers.d/manila_sudoers +COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/manila_sudoers + && chmod 440 /etc/sudoers.d/kolla_manila_sudoers {% endif %} -- cgit v1.2.3