diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-12 10:09:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-12 10:09:59 +0000 |
| commit | 9be6b2bd87b7862372bc787ceb3727a8418b4ce8 (patch) | |
| tree | d0b379c06f6587a3cf5dd1bf812ae633f9260e4c /docker/nova | |
| parent | 4995ca5bb8d8d445939853d33c03df8f3e76fb50 (diff) | |
| parent | 1d96a2bbe1b536b7d7f4cdbf55c6dabae6d058ae (diff) | |
| download | kolla-9be6b2bd87b7862372bc787ceb3727a8418b4ce8.tar.gz kolla-9be6b2bd87b7862372bc787ceb3727a8418b4ce8.zip | |
Merge "Adjust permissions on _extend_start files."
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 712d6ada9..b860481fc 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -80,6 +80,6 @@ RUN chmod 750 /etc/sudoers.d \ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_nova_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start + && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start {% block nova_base_footer %}{% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 3324175ba..199707b69 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -96,7 +96,7 @@ RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/auto {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chmod 644 /usr/local/bin/kolla_extend_start {% block nova_libvirt_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 4810393f6..8fd6b2447 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -31,7 +31,7 @@ RUN mkdir -p /var/run/sshd \ RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chmod 644 /usr/local/bin/kolla_extend_start {% block nova_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} |