diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-04 21:06:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-04 21:06:27 +0000 |
| commit | e3e9a8bea5ae72226bcc5eb35c746d10b3588522 (patch) | |
| tree | e54914434e5063aaa5add9aeb0e4238857bd40e3 /docker/nova | |
| parent | 603a3add80e05726f8e48e406bb840b0f21a5a1d (diff) | |
| parent | bbef9846c3eff5c96d4e81ffd3b4cf3446dd1eb2 (diff) | |
| download | kolla-e3e9a8bea5ae72226bcc5eb35c746d10b3588522.tar.gz kolla-e3e9a8bea5ae72226bcc5eb35c746d10b3588522.zip | |
Merge "nova-compute: trim image a bit on CentOS"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 3fa20eac0..730e56f68 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -39,7 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} -{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} +{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \ + && dnf remove -y linux-firmware \ + && dnf clean all {% elif base_package_type == 'deb' %} @@ -112,6 +114,10 @@ RUN rm -f /etc/nova/nova-compute.conf ] %} {% endif %} +{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \ + && dnf remove -y linux-firmware \ + && dnf clean all + {% elif base_package_type == 'deb' %} {% set nova_compute_packages = [ @@ -151,11 +157,11 @@ RUN rm -f /etc/nova/nova-compute.conf ] %} {% endif %} -RUN mkdir -p /etc/ceph +RUN mkdir -p /etc/ceph \ + && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }} {% endif %} -{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} {% set nova_compute_pip_packages = [ 'oslo-vmware' |