Test build for #1736

SUSE · Sep 25, 2024 · c4bc705 · c4bc705
1 parent 82f9736
commit c4bc705
Show file tree

Hide file tree

Showing 45 changed files with 145 additions and 49 deletions.
diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -21,7 +21,10 @@
 #!BuildVersion: 15.7
 FROM suse/sle15:15.7
 
-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 install --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
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7
 FROM suse/sle15:15.7
 
-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 install --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/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -72,5 +72,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-8.0/Dockerfile b/aspnet-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/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7
 FROM suse/sle15:15.7
 
-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 install --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/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/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -83,5 +83,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/Dockerfile b/dotnet-8.0/Dockerfile
@@ -83,5 +83,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/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -70,5 +70,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-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -70,7 +70,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/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.13
 FROM bci/bci-base:15.7
 
-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 install --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-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.7
 FROM bci/bci-base:15.7
 
-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 install --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/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/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildVersion: 15.7.1.22.2
 FROM bci/bci-base:15.7
 
-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 install --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
@@ -55,6 +58,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-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildVersion: 15.7
 FROM bci/bci-base:15.7
 
-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 install --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
@@ -55,6 +58,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-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildVersion: 15.7.1.23.1
 FROM bci/bci-base:15.7
 
-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 install --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
@@ -55,6 +58,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-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildVersion: 15.7
 FROM bci/bci-base:15.7
 
-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 install --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
@@ -55,6 +58,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/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -23,7 +23,10 @@
 #!BuildVersion: 15.7
 FROM suse/sle15:15.7
 
-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 install --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/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/init-image/Dockerfile b/init-image/Dockerfile
@@ -21,7 +21,10 @@
 #!BuildVersion: 15.7
 FROM bci/bci-base:15.7
 
-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
@@ -23,7 +23,10 @@
 #!BuildVersion: 15.7.9
 FROM bci/bci-base:15.7
 
-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/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -21,7 +21,10 @@
 #!BuildVersion: 15.7.1.21
 FROM suse/sle15:15.7
 
-RUN set -euo pipefail; zypper -n in --no-recommends gawk nginx findutils gettext-runtime; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends gawk nginx findutils gettext-runtime; \
+    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.nginx

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -25,7 +25,10 @@
 #!BuildVersion: 15.7.20
 FROM bci/bci-base:15.7
 
-RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 update-alternatives curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends nodejs20 npm20 update-alternatives curl findutils gawk git-core procps; \
+    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.nodejs

diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.21
 FROM bci/openjdk:21
 
-RUN set -euo pipefail; zypper -n in --no-recommends java-21-openjdk-devel maven; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends java-21-openjdk-devel maven; \
+    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.openjdk.devel

diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.21
 FROM bci/bci-base:15.7
 
-RUN set -euo pipefail; zypper -n in --no-recommends java-21-openjdk curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends java-21-openjdk curl findutils gawk git-core procps; \
+    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.openjdk

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -23,7 +23,10 @@
 #!BuildVersion: 15.7.5.3.7
 FROM bci/bci-init:15.7
 
-RUN set -euo pipefail; zypper -n in --no-recommends pcp hostname procps shadow gettext-runtime util-linux-systemd; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends pcp hostname procps shadow gettext-runtime util-linux-systemd; \
+    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.pcp

diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.8
 FROM bci/bci-base:15.7
 
-RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools apache2-mod_php8; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools apache2-mod_php8; \
+    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.php-apache

diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.8
 FROM bci/bci-base:15.7
 
-RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools php8-fpm; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools php8-fpm; \
+    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.php-fpm

diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.7.8
 FROM bci/bci-base:15.7
 
-RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools php8-readline; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring lifecycle-data-sle-module-development-tools php8-readline; \
+    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.php