diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 12:28:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 12:28:08 +0000 |
| commit | b02f643db03694074293858470a1db36246b4a0e (patch) | |
| tree | e94c5368abd484572a11bf445c5076f66b26b696 /docker/nova | |
| parent | daaea83378c825db203a54139b036fc7243e5bb8 (diff) | |
| parent | 016c5ed30c0fe6c46004731d13ec0748daa6c70c (diff) | |
| download | kolla-b02f643db03694074293858470a1db36246b4a0e.tar.gz kolla-b02f643db03694074293858470a1db36246b4a0e.zip | |
Merge "adjust permissions on _extend_start files (part II)"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-conductor/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 992a69325..395555564 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 b0d7327a7..2db11a224 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 e497d2d7f..1b297a9cd 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 %} |