From 2aa887c891c0d6c2f2f3fffa593c54509f8f4f32 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Wed, 25 Sep 2024 17:07:57 +0000 Subject: [PATCH] Test build for #1736 --- base-image/config.sh | 2 +- busybox-image/config.sh | 2 +- init-image/Dockerfile | 5 ++++- kiwi-image/Dockerfile | 5 ++++- micro-image/config.sh | 2 +- minimal-image/config.sh | 2 +- sle16-kernel-module-devel-image/Dockerfile | 5 ++++- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/base-image/config.sh b/base-image/config.sh index 8780936fd..9d51387a6 100644 --- a/base-image/config.sh +++ b/base-image/config.sh @@ -74,6 +74,6 @@ if command -v zypper > /dev/null; then zypper -n clean fi -rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} exit 0 diff --git a/busybox-image/config.sh b/busybox-image/config.sh index d0a9d6ed8..ec7e47cd1 100644 --- a/busybox-image/config.sh +++ b/busybox-image/config.sh @@ -29,6 +29,6 @@ if command -v zypper > /dev/null; then zypper -n clean fi -rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} exit 0 diff --git a/init-image/Dockerfile b/init-image/Dockerfile index 127c68787..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 /var/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/kiwi-image/Dockerfile b/kiwi-image/Dockerfile index 6e754bd4d..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 /var/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/micro-image/config.sh b/micro-image/config.sh index 7e28e1e4f..4063b6633 100644 --- a/micro-image/config.sh +++ b/micro-image/config.sh @@ -26,6 +26,6 @@ if command -v zypper > /dev/null; then zypper -n clean fi -rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} exit 0 diff --git a/minimal-image/config.sh b/minimal-image/config.sh index 26105b028..a3a941d8e 100644 --- a/minimal-image/config.sh +++ b/minimal-image/config.sh @@ -32,6 +32,6 @@ if command -v zypper > /dev/null; then zypper -n clean fi -rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} exit 0 diff --git a/sle16-kernel-module-devel-image/Dockerfile b/sle16-kernel-module-devel-image/Dockerfile index 76a72f53c..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 /var/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