diff options
| author | Zuul <zuul@review.opendev.org> | 2024-01-19 12:14:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-01-19 12:14:45 +0000 |
| commit | 1580d778219b2d4e40c53ca9d5a437fe2a82e524 (patch) | |
| tree | a0f2abe94251a11b5b06d6ee803416cdb63eaf87 /docker | |
| parent | 7f5a904e98d7dd1213517257132d2eff23dfeadb (diff) | |
| parent | fa3e5f444ab49b12b8abb4779ea7fdf330983f17 (diff) | |
| download | kolla-1580d778219b2d4e40c53ca9d5a437fe2a82e524.tar.gz kolla-1580d778219b2d4e40c53ca9d5a437fe2a82e524.zip | |
Merge "Stop removing missing /run/nologin in RPM images"
Diffstat (limited to 'docker')
| -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 |