Test build for #1736

SUSE · Sep 25, 2024 · 2aa887c · 2aa887c
1 parent 9e7a442
commit 2aa887c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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