diff options
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 233dedf7c..442f2df9d 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -12,6 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-server', 'rsync' ] %} + +{% if distro_package_manager == 'dnf' %} +# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which +# prevents SSH access to it. +RUN rm -f /run/nologin +{% endif %} + {% 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 a032cb6e7..3d0ebd04d 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -11,7 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-server' ] %} -{% if base_package_type == 'deb' %} +{% if base_package_type == 'rpm' %} + +{% if distro_package_manager == 'dnf' %} +# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which +# prevents SSH access to it. +RUN rm -f /run/nologin +{% endif %} + +{% elif base_package_type == 'deb' %} RUN mkdir -p /var/run/sshd \ && chmod 0755 /var/run/sshd |