aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/manila/manila-base/Dockerfile.j29
1 files changed, 4 insertions, 5 deletions
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 %}