From fa3e5f444ab49b12b8abb4779ea7fdf330983f17 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 8 Jan 2024 22:39:33 +0100 Subject: 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 --- docker/nova/nova-ssh/Dockerfile.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docker/nova') 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 -- cgit v1.2.3