diff options
| -rw-r--r-- | docker/haproxy/haproxy-ssh/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 8 |
3 files changed, 1 insertions, 15 deletions
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', diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 3a44ba2ef..6e59d8fa8 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -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', 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 |