openstack
/
kolla
Code Issues Proposed changes

Merge "Stop removing missing /run/nologin in RPM images"

This commit is contained in:
Zuul 2024-01-19 12:14:45 +00:00 committed by Gerrit Code Review
parent 7f5a904e98 fa3e5f444a
commit 1580d77821
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/haproxy/haproxy-ssh/Dockerfile.j2
View File

@ -16,10 +16,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'rsync',
] %}
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
# prevents SSH access to it.
RUN rm -f /run/nologin
{% elif base_package_type == 'deb' %}
{% set haproxy_ssh_packages = [
'openssh-server',

4
docker/keystone/keystone-ssh/Dockerfile.j2
View File

@ -15,10 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'rsync'
] %}
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
# prevents SSH access to it.
RUN rm -f /run/nologin
{% elif base_package_type == 'deb' %}
{% set keystone_ssh_packages = [
'openssh-server',

8
docker/nova/nova-ssh/Dockerfile.j2
View File

@ -13,13 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssh-server'
] %}
{% if base_package_type == 'rpm' %}
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
# prevents SSH access to it.
RUN rm -f /run/nologin
{% elif base_package_type == 'deb' %}
{% if base_package_type == 'deb' %}
RUN mkdir -p /var/run/sshd \
&& chmod 0755 /var/run/sshd