From eb2a648b70570a2fcd2b6419ad3d6192633c9495 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Fri, 20 Jan 2017 06:58:05 +0000 Subject: Fix manila-base dockerfile format source and binary alll need sudoers Change-Id: I190a0b8cbbb05460e1ff80e0e7a30d05c3392640 --- docker/manila/manila-base/Dockerfile.j2 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index aad817c9e..223173262 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -47,15 +47,14 @@ RUN ln -s manila-base-source/* manila \ && chown -R manila: /etc/manila /var/cache/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/kolla_manila_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_manila_sudoers - {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers -RUN touch /usr/local/bin/kolla_manila_extend_start \ +RUN chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_manila_sudoers \ + && touch /usr/local/bin/kolla_manila_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start {% block manila_base_footer %}{% endblock %} -- cgit v1.2.3