From 016c5ed30c0fe6c46004731d13ec0748daa6c70c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 22 Apr 2022 11:34:55 +0200 Subject: [PATCH] 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/aodh/aodh-api/Dockerfile.j2 | 2 +- docker/barbican/barbican-api/Dockerfile.j2 | 2 +- docker/blazar/blazar-api/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 2 +- docker/cinder/cinder-api/Dockerfile.j2 | 2 +- docker/cinder/cinder-volume/Dockerfile.j2 | 2 +- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 2 +- docker/cyborg/cyborg-api/Dockerfile.j2 | 2 +- docker/designate/designate-central/Dockerfile.j2 | 2 +- docker/freezer/freezer-api/Dockerfile.j2 | 2 +- docker/glance/glance-api/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-api/Dockerfile.j2 | 2 +- docker/heat/heat-api-cfn/Dockerfile.j2 | 2 +- docker/heat/heat-api/Dockerfile.j2 | 2 +- docker/ironic/ironic-api/Dockerfile.j2 | 2 +- docker/ironic/ironic-pxe/Dockerfile.j2 | 2 +- docker/magnum/magnum-api/Dockerfile.j2 | 2 +- docker/manila/manila-api/Dockerfile.j2 | 2 +- docker/masakari/masakari-api/Dockerfile.j2 | 2 +- docker/mistral/mistral-api/Dockerfile.j2 | 2 +- docker/monasca/monasca-api/Dockerfile.j2 | 2 +- docker/murano/murano-api/Dockerfile.j2 | 2 +- docker/neutron/neutron-server/Dockerfile.j2 | 2 +- docker/nova/nova-api/Dockerfile.j2 | 2 +- docker/nova/nova-compute/Dockerfile.j2 | 2 +- docker/nova/nova-conductor/Dockerfile.j2 | 2 +- docker/octavia/octavia-api/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 +- docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 | 2 +- docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 | 2 +- docker/sahara/sahara-api/Dockerfile.j2 | 2 +- docker/senlin/senlin-api/Dockerfile.j2 | 2 +- docker/solum/solum-api/Dockerfile.j2 | 2 +- docker/tacker/tacker-server/Dockerfile.j2 | 2 +- docker/trove/trove-api/Dockerfile.j2 | 2 +- docker/venus/venus-manager/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-api/Dockerfile.j2 | 2 +- docker/watcher/watcher-api/Dockerfile.j2 | 2 +- docker/zun/zun-api/Dockerfile.j2 | 2 +- docker/zun/zun-compute/Dockerfile.j2 | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 3bf4626a69..e93cebda53 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start -RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start +RUN chmod 644 /usr/local/bin/kolla_aodh_extend_start {% block aodh_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index 0a193c0600..7f46539212 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start -RUN chmod 755 /usr/local/bin/kolla_barbican_extend_start +RUN chmod 644 /usr/local/bin/kolla_barbican_extend_start {% block barbican_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2 index ee10e13fb5..c3713dafa5 100644 --- a/docker/blazar/blazar-api/Dockerfile.j2 +++ b/docker/blazar/blazar-api/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block blazar_api_header %}{% endblock %} COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start -RUN chmod 755 /usr/local/bin/kolla_blazar_extend_start +RUN chmod 644 /usr/local/bin/kolla_blazar_extend_start {% block blazar_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 3624d2b120..140c30b67e 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start -RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start +RUN chmod 644 /usr/local/bin/kolla_ceilometer_extend_start {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index ee7638356a..b091acb8c8 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 afc529ab5f..3f2ea6bd18 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 %} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index a0588dd48e..836ca2db40 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start -RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start +RUN chmod 644 /usr/local/bin/kolla_cloudkitty_extend_start {% block cloudkitty_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 2863de3d6b..235bdb47a7 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -11,7 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start -RUN chmod 755 /usr/local/bin/kolla_cyborg_extend_start +RUN chmod 644 /usr/local/bin/kolla_cyborg_extend_start {% block cyborg_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index b7c8712979..5ccd775b26 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_designate_extend_start -RUN chmod 755 /usr/local/bin/kolla_designate_extend_start +RUN chmod 644 /usr/local/bin/kolla_designate_extend_start {% block designate_central_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 6a862b054a..9069aa7261 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -23,7 +23,7 @@ COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start RUN ln -s freezer-api-source/* freezer-api \ && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \ && cp -r /freezer-api/etc/freezer/* /etc/freezer/ \ - && chmod 755 /usr/local/bin/kolla_freezer_extend_start + && chmod 644 /usr/local/bin/kolla_freezer_extend_start {% block freezer_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 7b42c8d127..23ebd70211 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(glance_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start -RUN chmod 755 /usr/local/bin/kolla_glance_extend_start +RUN chmod 644 /usr/local/bin/kolla_glance_extend_start {% block glance_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index a0fdfea290..a2c2064991 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start -RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start +RUN chmod 644 /usr/local/bin/kolla_gnocchi_extend_start {% block gnocchi_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 42dd55199d..b98adc4c05 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start -RUN chmod 755 /usr/local/bin/kolla_heat_extend_start +RUN chmod 644 /usr/local/bin/kolla_heat_extend_start {% block heat_api_cfn_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index af9c5e0ad8..bcb9852557 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start -RUN chmod 755 /usr/local/bin/kolla_heat_extend_start +RUN chmod 644 /usr/local/bin/kolla_heat_extend_start {% block heat_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 7f4b8b8805..b88d579b38 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(ironic_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start -RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start +RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index b9c1da51c5..d122e1b115 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -47,7 +47,7 @@ ENV TFTPBOOT_PATH=/tftpboot \ HTTPBOOT_PATH=/httpboot COPY tftp-map-file-template /map-file-template COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start -RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start +RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start {% block ironic_pxe_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index ddd16ea877..2792429902 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start -RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start +RUN chmod 644 /usr/local/bin/kolla_magnum_extend_start {% block magnum_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 5ceb9e372d..dece703f3e 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -15,7 +15,7 @@ COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start RUN mkdir -p /var/www/cgi-bin/manila \ && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \ - && chmod 755 /usr/local/bin/kolla_manila_extend_start \ + && chmod 644 /usr/local/bin/kolla_manila_extend_start \ && chown -R manila: /var/www/cgi-bin/manila \ && chmod 755 /var/www/cgi-bin/manila/manila-wsgi diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/docker/masakari/masakari-api/Dockerfile.j2 index c19f48c77e..0d5ef8cfe8 100644 --- a/docker/masakari/masakari-api/Dockerfile.j2 +++ b/docker/masakari/masakari-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_masakari_extend_start -RUN chmod 755 /usr/local/bin/kolla_masakari_extend_start +RUN chmod 644 /usr/local/bin/kolla_masakari_extend_start {% block masakari_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 87994f864b..4c4c643ca5 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(mistral_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start -RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start +RUN chmod 644 /usr/local/bin/kolla_mistral_extend_start {% block mistral_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index 56377f31c6..4b39e44649 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -27,7 +27,7 @@ COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start RUN ln -s monasca-api-source/* monasca-api \ && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }} \ - && chmod 755 /usr/local/bin/kolla_monasca_extend_start + && chmod 644 /usr/local/bin/kolla_monasca_extend_start {% block monasca_api_footer %}{% endblock %} diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 09fa9ec985..0d3637d9e1 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start -RUN chmod 755 /usr/local/bin/kolla_murano_extend_start +RUN chmod 644 /usr/local/bin/kolla_murano_extend_start {% block murano_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index c5fe4d78c9..da81e67d07 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -23,7 +23,7 @@ RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packag && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \ fi \ - && chmod 755 /usr/local/bin/kolla_neutron_extend_start + && chmod 644 /usr/local/bin/kolla_neutron_extend_start {% block neutron_server_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 992a69325a..395555564e 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(nova_api_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start -RUN chmod 755 /usr/local/bin/kolla_nova_extend_start +RUN chmod 644 /usr/local/bin/kolla_nova_extend_start {% block nova_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index b0d7327a78..2db11a2247 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -103,7 +103,7 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \ fi \ - && chmod 755 /usr/local/bin/kolla_nova_extend_start \ + && chmod 644 /usr/local/bin/kolla_nova_extend_start \ && rm -f /etc/machine-id {% block nova_compute_footer %}{% endblock %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index e497d2d7fc..1b297a9cde 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start -RUN chmod 755 /usr/local/bin/kolla_nova_extend_start +RUN chmod 644 /usr/local/bin/kolla_nova_extend_start {% block nova_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index da63ece59c..e84064ed72 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -21,7 +21,7 @@ COPY extend_start.sh /usr/local/bin/kolla_octavia_extend_start RUN if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(octavia_api_plugins_pip_packages) }} ; \ fi \ - && chmod 755 /usr/local/bin/kolla_octavia_extend_start + && chmod 644 /usr/local/bin/kolla_octavia_extend_start {{ macros.install_packages(octavia_api_packages | customizable("packages")) }} diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index 39b0060ebb..7c72466d02 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -25,7 +25,7 @@ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start -RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start +RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start {% block openvswitch_netcontrold_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 711bc99b27..1e1b8d0541 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block openvswitch_vswitchd_header %}{% endblock %} COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start -RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start +RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start {% block openvswitch_vswitchd_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 index af95922723..d385802077 100644 --- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server -RUN chmod 755 /usr/local/bin/kolla_ovsdpdk_extend_start && \ +RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start && \ chmod 755 /usr/local/bin/start-ovsdb-server {% block ovsdpdk_db_footer %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 index f23e0b79d7..fb0673e221 100644 --- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block ovsdpdk_vswitchd_header %}{% endblock %} COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start -RUN chmod 755 /usr/local/bin/kolla_ovsdpdk_extend_start +RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start {% block ovsdpdk_vswitchd_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index aafab3ba6c..585934ff20 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start -RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start +RUN chmod 644 /usr/local/bin/kolla_sahara_extend_start {% block sahara_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index d7e8f6abd0..d93f059940 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start -RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start +RUN chmod 644 /usr/local/bin/kolla_senlin_extend_start {% block senlin_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 06fbb038c5..92459029da 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block solum_api_header %}{% endblock %} COPY extend_start.sh /usr/local/bin/kolla_solum_extend_start -RUN chmod 755 /usr/local/bin/kolla_solum_extend_start +RUN chmod 644 /usr/local/bin/kolla_solum_extend_start {% block solum_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index 3e13a02e8f..ff20d791e4 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start -RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start +RUN chmod 644 /usr/local/bin/kolla_tacker_extend_start {% block tacker_server_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 5109479e6a..3281215b4f 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start -RUN chmod 755 /usr/local/bin/kolla_trove_extend_start +RUN chmod 644 /usr/local/bin/kolla_trove_extend_start {% block trove_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2 index a15b6c92bf..272a905e67 100644 --- a/docker/venus/venus-manager/Dockerfile.j2 +++ b/docker/venus/venus-manager/Dockerfile.j2 @@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block venus_manager_header %}{% endblock %} -RUN chmod 755 /usr/local/bin/kolla_venus_extend_start +RUN chmod 644 /usr/local/bin/kolla_venus_extend_start {% block venus_manager_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index b50e1a6139..2f0521d954 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start -RUN chmod 755 /usr/local/bin/kolla_vitrage_extend_start +RUN chmod 644 /usr/local/bin/kolla_vitrage_extend_start {% block vitrage_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index d080811dfa..2d4057e038 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start -RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start +RUN chmod 644 /usr/local/bin/kolla_watcher_extend_start {% block watcher_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 index e43a1b87fa..ed68d0b35b 100644 --- a/docker/zun/zun-api/Dockerfile.j2 +++ b/docker/zun/zun-api/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block zun_api_header %}{% endblock %} COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start -RUN chmod 755 /usr/local/bin/kolla_zun_extend_start +RUN chmod 644 /usr/local/bin/kolla_zun_extend_start {% block zun_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index ea6fa6d618..957e20e31e 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start -RUN chmod 755 /usr/local/bin/kolla_zun_extend_start \ +RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \ && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_zun_sudoers