diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2024-01-08 22:39:33 +0100 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2024-01-08 22:39:33 +0100 |
| commit | fa3e5f444ab49b12b8abb4779ea7fdf330983f17 (patch) | |
| tree | 57c371d4dd5a23b9f7b0de96b97beb24345860a3 /docker/nova/nova-ssh | |
| parent | 9ebd51f7991a76059e91be98ac579ff705954337 (diff) | |
| download | kolla-fa3e5f444ab49b12b8abb4779ea7fdf330983f17.tar.gz kolla-fa3e5f444ab49b12b8abb4779ea7fdf330983f17.zip | |
Stop removing missing /run/nologin in RPM images
This code was valid for centos:8 and centos:stream8, but is not required
for centos:stream9 or rockylinux:9 which do not include this file.
Change-Id: I50f78d73afe0944dd91998ab9799fa2f36cc46a3
Diffstat (limited to 'docker/nova/nova-ssh')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 945e9489d..605fa9883 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -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 |