diff options
| author | Zuul <zuul@review.opendev.org> | 2024-11-15 12:09:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-11-15 12:09:58 +0000 |
| commit | dca8462bc491a93c6a6ae71e86d59a2dcb804ff5 (patch) | |
| tree | bc41637caaa762e5dce1452c16d3b5f52f3cbf96 /docker/keystone | |
| parent | 68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff) | |
| parent | 11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff) | |
| download | kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip | |
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone-fernet/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 069bf1a6e..7764accbd 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -45,4 +45,6 @@ RUN ln -s keystone-base-source/* keystone \ RUN chmod 755 /var/www/cgi-bin/keystone/* +{{ macros.kolla_patch_sources() }} + {% block keystone_base_footer %}{% endblock %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index edc2f8d1a..588b41023 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -28,5 +28,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 644 /usr/local/bin/kolla_extend_start \ && chmod 755 /usr/local/bin/kolla_keystone_bootstrap /usr/bin/fetch_fernet_tokens.py +{{ macros.kolla_patch_sources() }} + {% 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 6e59d8fa8..9cf977ca0 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -32,5 +32,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd \ && chmod 644 /usr/local/bin/kolla_extend_start +{{ macros.kolla_patch_sources() }} + {% block keystone_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 97393fef8..26af6932e 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -41,5 +41,7 @@ RUN chmod 644 /usr/local/bin/kolla_extend_start \ {{ macros.install_pip(keystone_plugins_pip_packages) }}; \ fi +{{ macros.kolla_patch_sources() }} + {% block keystone_footer %}{% endblock %} {% block footer %}{% endblock %} |