aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
Diffstat (limited to 'docker/keystone')
-rw-r--r--docker/keystone/keystone-ssh/Dockerfile.j26
-rw-r--r--docker/keystone/keystone/Dockerfile.j212
2 files changed, 9 insertions, 9 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2
index f9bc63f50..3a44ba2ef 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/docker/keystone/keystone-ssh/Dockerfile.j2
@@ -31,10 +31,10 @@ RUN mkdir -p /var/run/sshd \
{% endif %}
{{ macros.install_packages(keystone_ssh_packages | customizable("packages")) }}
-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 644 /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
{% block keystone_ssh_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index eee036be3..6f7f7d6ec 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
-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
-
{% if base_package_type == 'rpm' %}
{% set keystone_packages = [
'mod_auth_gssapi',
@@ -29,7 +24,12 @@ ADD plugins-archive /
'requests-kerberos',
] %}
-RUN if [ "$(ls /plugins)" ]; then \
+COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
+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 \
+ && if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(keystone_plugins_pip_packages) }}; \
fi