aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-ssh
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/nova/nova-ssh
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/nova/nova-ssh')
-rw-r--r--docker/nova/nova-ssh/Dockerfile.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index 8fd6b2447..945e9489d 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/docker/nova/nova-ssh/Dockerfile.j2
@@ -28,10 +28,10 @@ RUN mkdir -p /var/run/sshd \
{{ macros.install_packages(nova_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 nova_ssh_footer %}{% endblock %}
{% block footer %}{% endblock %}