diff --git a/init-image/Dockerfile b/init-image/Dockerfile index 09af77f16..2529645e5 100644 --- a/init-image/Dockerfile +++ b/init-image/Dockerfile @@ -20,7 +20,10 @@ FROM bci/bci-base:16.0 -RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip SLES-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends systemd gzip SLES-release; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.init diff --git a/init-image/init-image.changes b/init-image/init-image.changes index 82522ba90..62e6d0379 100644 --- a/init-image/init-image.changes +++ b/init-image/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:36:27 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile index 21722c95a..01d445a50 100644 --- a/kiwi-image/Dockerfile +++ b/kiwi-image/Dockerfile @@ -22,7 +22,10 @@ FROM bci/bci-base:16.0 -RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-repart enchant-devel gcc glibc-devel iproute2 java-21-openjdk-headless jing kiwi-systemdeps-filesystems kpartx libxml2-devel lvm2 make netcat-openbsd python3-devel python3-kiwi python3-pip tack timezone xorriso xz SLES-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends checkmedia dracut-kiwi-oem-repart enchant-devel gcc glibc-devel iproute2 java-21-openjdk-headless jing kiwi-systemdeps-filesystems kpartx libxml2-devel lvm2 make netcat-openbsd python3-devel python3-kiwi python3-pip tack timezone xorriso xz SLES-release; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.kiwi diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes index 0311b2c9b..1625742d5 100644 --- a/kiwi-image/kiwi-image.changes +++ b/kiwi-image/kiwi-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:36:27 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller diff --git a/sle16-kernel-module-devel-image/Dockerfile b/sle16-kernel-module-devel-image/Dockerfile index 6505c7fe4..181499c36 100644 --- a/sle16-kernel-module-devel-image/Dockerfile +++ b/sle16-kernel-module-devel-image/Dockerfile @@ -20,7 +20,10 @@ FROM bci/bci-base:16.0 -RUN set -euo pipefail; zypper -n in --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build SLES-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build SLES-release; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.sle16-kernel-module-devel diff --git a/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes b/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes index cdb35af7b..ee8937116 100644 --- a/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes +++ b/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:36:27 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller