Skip to content

Commit fa3e5f4

Browse files
committed
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
1 parent 9ebd51f commit fa3e5f4

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

docker/haproxy/haproxy-ssh/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1616
'rsync',
1717
] %}
1818

19-
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
20-
# prevents SSH access to it.
21-
RUN rm -f /run/nologin
22-
2319
{% elif base_package_type == 'deb' %}
2420
{% set haproxy_ssh_packages = [
2521
'openssh-server',

docker/keystone/keystone-ssh/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1515
'rsync'
1616
] %}
1717

18-
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
19-
# prevents SSH access to it.
20-
RUN rm -f /run/nologin
21-
2218
{% elif base_package_type == 'deb' %}
2319
{% set keystone_ssh_packages = [
2420
'openssh-server',

docker/nova/nova-ssh/Dockerfile.j2

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1313
'openssh-server'
1414
] %}
1515

16-
{% if base_package_type == 'rpm' %}
17-
18-
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
19-
# prevents SSH access to it.
20-
RUN rm -f /run/nologin
21-
22-
{% elif base_package_type == 'deb' %}
16+
{% if base_package_type == 'deb' %}
2317

2418
RUN mkdir -p /var/run/sshd \
2519
&& chmod 0755 /var/run/sshd

0 commit comments

Comments
 (0)