SUSE · dirkmueller · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
diff --git a/389-ds-container/389-ds-container.changes b/389-ds-container/389-ds-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -23,7 +23,7 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends 389-ds timezone openssl nss_synth; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends 389-ds timezone openssl nss_synth; 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.application.389-ds

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -24,7 +24,7 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-alertmanager curl; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-alertmanager curl; 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.application.alertmanager

diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -73,5 +73,5 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
diff --git a/aspnet-runtime-6.0/aspnet-runtime-6.0.changes b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -74,7 +74,7 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 
 ENV APP_UID=1654 ASPNETCORE_HTTP_PORTS=8080 DOTNET_RUNNING_IN_CONTAINER=true

diff --git a/aspnet-runtime-8.0/aspnet-runtime-8.0.changes b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/base-fips-image/Dockerfile b/base-fips-image/Dockerfile
@@ -22,7 +22,7 @@
 #!BuildVersion: 15.6
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends sles-release coreutils crypto-policies-scripts; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends sles-release coreutils crypto-policies-scripts; 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.base-fips

diff --git a/base-fips-image/base-fips-image.changes b/base-fips-image/base-fips-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Mon Sep 16 08:22:54 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -24,7 +24,7 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends prometheus-blackbox_exporter curl; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends prometheus-blackbox_exporter curl; 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.application.blackbox_exporter

diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Fri Sep 13 09:55:59 UTC 2024 - Dirk Mueller <[email protected]>
 

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/distribution-image/config.sh b/distribution-image/config.sh
@@ -25,6 +25,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/distribution-image/distribution-image.changes b/distribution-image/distribution-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Fri Sep 13 09:55:59 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -84,5 +84,5 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
diff --git a/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -85,5 +85,5 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
diff --git a/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -71,5 +71,5 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
diff --git a/dotnet-runtime-6.0/dotnet-runtime-6.0.changes b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -72,7 +72,7 @@ RUN zypper --non-interactive install --no-recommends libicu libopenssl1_1 /tmp/*
 COPY prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo
 COPY dotnet-host.check /etc/zypp/systemCheck.d/dotnet-host.check
 
-RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN rm -rf /tmp/* && zypper clean && rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 
 ENV APP_UID=1654 ASPNETCORE_HTTP_PORTS=8080 DOTNET_RUNNING_IN_CONTAINER=true

diff --git a/dotnet-runtime-8.0/dotnet-runtime-8.0.changes b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -23,7 +23,7 @@
 #!BuildVersion: 15.6.13
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.gcc

diff --git a/gcc-13-image/gcc-13-image.changes b/gcc-13-image/gcc-13-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -22,7 +22,7 @@
 #!BuildVersion: 15.6.7
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends gcc7 gcc7-c++ make gcc gcc-c++ curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends gcc7 gcc7-c++ make gcc gcc-c++ curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.gcc

diff --git a/gcc-7-image/gcc-7-image.changes b/gcc-7-image/gcc-7-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/git-image/config.sh b/git-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/git-image/git-image.changes b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -25,7 +25,7 @@
 #!BuildRelease: 33
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.golang
@@ -56,6 +56,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
 RUN set -euo pipefail; if zypper -n install go1.22-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
-RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go
 
diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -25,7 +25,7 @@
 #!BuildRelease: 33
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.20-openssl go1.20-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends go1.20-openssl go1.20-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.golang
@@ -56,6 +56,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
 RUN set -euo pipefail; if zypper -n install go1.20-openssl-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
-RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go
 
diff --git a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -26,7 +26,7 @@
 #!BuildRelease: 33
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.golang
@@ -57,6 +57,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
 RUN set -euo pipefail; if zypper -n install go1.23-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
-RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go
 
diff --git a/golang-stable-image/golang-stable-image.changes b/golang-stable-image/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -26,7 +26,7 @@
 #!BuildRelease: 33
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.21-openssl go1.21-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends go1.21-openssl go1.21-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; 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.golang
@@ -57,6 +57,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
 RUN set -euo pipefail; if zypper -n install go1.21-openssl-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
-RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go
 
diff --git a/golang-stable-openssl-image/golang-stable-openssl-image.changes b/golang-stable-openssl-image/golang-stable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -25,7 +25,7 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends grafana; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends grafana; 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.application.grafana

diff --git a/grafana-image/grafana-image.changes b/grafana-image/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/helm-image/config.sh b/helm-image/config.sh
@@ -25,6 +25,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/helm-image/helm-image.changes b/helm-image/helm-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
+
+- improved log cleaning
+
 -------------------------------------------------------------------
 Fri Sep 13 09:55:59 UTC 2024 - Dirk Mueller <[email protected]>