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/haproxy/haproxy-ssh/Dockerfile.j2 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docker/haproxy') diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2 index b8277a237..98a083f5a 100644 --- a/docker/haproxy/haproxy-ssh/Dockerfile.j2 +++ b/docker/haproxy/haproxy-ssh/Dockerfile.j2 @@ -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', -- cgit v1.2.3