From 016c5ed30c0fe6c46004731d13ec0748daa6c70c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 22 Apr 2022 11:34:55 +0200 Subject: adjust permissions on _extend_start files (part II) Tim Shearer started it in 1d96a2bbe1b536b7d7f4cdbf55c6dabae6d058ae. Since all extend_start files are sourced rather than executed, the executable bits are now cleared throughout the project. Change-Id: Ia1797c32fc6a35f9f077c673abf4d8e16e51a760 --- docker/cinder/cinder-api/Dockerfile.j2 | 2 +- docker/cinder/cinder-volume/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/cinder') diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index ee7638356..b091acb8c 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -16,7 +16,7 @@ COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start RUN mkdir -p /var/www/cgi-bin/cinder \ && cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \ - && chmod 755 /usr/local/bin/kolla_cinder_extend_start \ + && chmod 644 /usr/local/bin/kolla_cinder_extend_start \ && chown -R cinder: /var/www/cgi-bin/cinder \ && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index afc529ab5..3f2ea6bd1 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -46,7 +46,7 @@ COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \ - && chmod 755 /usr/local/bin/kolla_cinder_extend_start + && chmod 644 /usr/local/bin/kolla_cinder_extend_start {% block cinder_volume_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3