From 2774e59ca74b2131318024002eb754badbe05790 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 25 Nov 2021 16:51:22 +0100 Subject: [PATCH] nova-compute: trim image a bit on CentOS libguestfs package fetched kernel-core one which fetched linux-firmware. We remove the last one and save ~500MB of space: before/centos-binary-nova-compute: 3.3GB after1/centos-binary-nova-compute: 2.71GB Closes-Bug: #1946801 Change-Id: I98cc19c95fcec07dd4e494c14c09938d754f1de0 (cherry picked from commit bbef9846c3eff5c96d4e81ffd3b4cf3446dd1eb2) --- docker/nova/nova-compute/Dockerfile.j2 | 12 +++++++++--- releasenotes/notes/bug-1946801-5f3af3c44e567fcf.yaml | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-1946801-5f3af3c44e567fcf.yaml diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 724fda8713..f98cac2e1b 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' diff --git a/releasenotes/notes/bug-1946801-5f3af3c44e567fcf.yaml b/releasenotes/notes/bug-1946801-5f3af3c44e567fcf.yaml new file mode 100644 index 0000000000..b67c9751fd --- /dev/null +++ b/releasenotes/notes/bug-1946801-5f3af3c44e567fcf.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + CentOS ``nova-compute`` image has ``linux-firmware`` package removed to save + image size by ~500MB. + `LP#1926801 `__