diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/nova/nova-ssh | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/nova/nova-ssh')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index b66b587ab..4810393f6 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -15,11 +15,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% 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' %} |