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/keystone | |
| 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/keystone')
| -rw-r--r-- | docker/keystone/keystone-fernet/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 702e064a9..edc2f8d1a 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -25,7 +25,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY fetch_fernet_tokens.py /usr/bin/ COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap /usr/bin/fetch_fernet_tokens.py +RUN chmod 644 /usr/local/bin/kolla_extend_start \ + && chmod 755 /usr/local/bin/kolla_keystone_bootstrap /usr/bin/fetch_fernet_tokens.py {% block keystone_fernet_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 770832991..f9bc63f50 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -34,7 +34,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 keystone_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 3c8df2e75..eee036be3 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -9,7 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap +RUN chmod 644 /usr/local/bin/kolla_extend_start \ + && chmod 755 /usr/local/bin/kolla_keystone_bootstrap {% if base_package_type == 'rpm' %} {% set keystone_packages = [ |