From c4bc705899b861bb9cd06001464ba9dc8f511eec Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Wed, 25 Sep 2024 17:07:58 +0000 Subject: [PATCH] Test build for #1736 --- 389-ds-container/Dockerfile | 5 ++++- alertmanager-image/Dockerfile | 5 ++++- aspnet-runtime-6.0/Dockerfile | 2 +- aspnet-runtime-8.0/Dockerfile | 2 +- blackbox_exporter-image/Dockerfile | 5 ++++- busybox-image/config.sh | 2 +- distribution-image/config.sh | 2 +- dotnet-6.0/Dockerfile | 2 +- dotnet-8.0/Dockerfile | 2 +- dotnet-runtime-6.0/Dockerfile | 2 +- dotnet-runtime-8.0/Dockerfile | 2 +- gcc-13-image/Dockerfile | 5 ++++- gcc-7-image/Dockerfile | 5 ++++- git-image/config.sh | 2 +- golang-oldstable-image/Dockerfile | 7 +++++-- golang-oldstable-openssl-image/Dockerfile | 7 +++++-- golang-stable-image/Dockerfile | 7 +++++-- golang-stable-openssl-image/Dockerfile | 7 +++++-- grafana-image/Dockerfile | 5 ++++- helm-image/config.sh | 2 +- init-image/Dockerfile | 5 ++++- kiwi-image/Dockerfile | 5 ++++- micro-image/config.sh | 2 +- minimal-image/config.sh | 2 +- nginx-image/Dockerfile | 5 ++++- nodejs-20-image/Dockerfile | 5 ++++- openjdk-21-devel-image/Dockerfile | 5 ++++- openjdk-21-image/Dockerfile | 5 ++++- pcp-image/Dockerfile | 5 ++++- php-apache8-image/Dockerfile | 5 ++++- php-fpm8-image/Dockerfile | 5 ++++- php8-image/Dockerfile | 5 ++++- postgres-16-image/Dockerfile | 5 ++++- prometheus-image/Dockerfile | 5 ++++- python-3.12-image/Dockerfile | 5 ++++- rmt-mariadb-client-image/Dockerfile | 5 ++++- rmt-mariadb-image/Dockerfile | 5 ++++- rmt-server-image/Dockerfile | 5 ++++- ruby-2.5-image/Dockerfile | 5 ++++- rust-oldstable-image/Dockerfile | 5 ++++- rust-stable-image/Dockerfile | 5 ++++- sac-postfix-image/Dockerfile | 5 ++++- sle15-kernel-module-devel-image/Dockerfile | 5 ++++- sles15-image/config.sh | 2 +- spack-image/Dockerfile | 5 ++++- 45 files changed, 145 insertions(+), 49 deletions(-) diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile index 2139ae8d0..0864ab25f 100644 --- 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 index 1c5a8f8c1..1c029a11d 100644 --- 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 index 92ad5b648..efb0ead7e 100644 --- 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 index 56165d3d7..98dc2d070 100644 --- 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 index e9f15888c..fdecf08eb 100644 --- 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 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/distribution-image/config.sh b/distribution-image/config.sh index 3e4abc019..16657a63b 100644 --- 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 index 862bce9c2..0467fd3b7 100644 --- 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 index efc65f224..d4bb11eab 100644 --- 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 index 5023a5d9c..abe56b9b6 100644 --- 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 index fb2861888..98c0b009a 100644 --- 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 index 96ecfdb2f..18bf8ca7d 100644 --- 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 index aef182588..2efd5500c 100644 --- 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 index 7e28e1e4f..4063b6633 100644 --- 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 index 75350c61c..9d3af9463 100644 --- 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 index 2baf730a7..964f95c4f 100644 --- 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 index 02b886297..747b1819f 100644 --- 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 index ef1e8916c..b0c7f1a53 100644 --- 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 index 48df42d27..832c48b70 100644 --- 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 index 3e4abc019..16657a63b 100644 --- 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 index 6d48de398..ad99c39c5 100644 --- 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 index 3718e2e25..e840466ef 100644 --- 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 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/nginx-image/Dockerfile b/nginx-image/Dockerfile index e9af65b9e..ec6e82729 100644 --- 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 index 68b2e5142..b2fa8ed93 100644 --- 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 index 32b2607cc..342ed23e3 100644 --- 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 index 80c3f6951..a42bdfcb4 100644 --- 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 index 7fbbbd1e7..0fc0adb9c 100644 --- 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 index e5013f441..24626c172 100644 --- 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 index 96f097ffa..c2ecdf22f 100644 --- 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 index b6951883a..3547928f5 100644 --- 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 diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile index 1f860a029..7c3beed24 100644 --- a/postgres-16-image/Dockerfile +++ b/postgres-16-image/Dockerfile @@ -24,7 +24,10 @@ #!BuildVersion: 15.7.16 FROM suse/sle15:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql16-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends libpq5 postgresql16-server findutils; \ + 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.postgres diff --git a/prometheus-image/Dockerfile b/prometheus-image/Dockerfile index 6737780d2..fefe99de7 100644 --- a/prometheus-image/Dockerfile +++ b/prometheus-image/Dockerfile @@ -23,7 +23,10 @@ #!BuildVersion: 15.7 FROM suse/sle15:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-prometheus 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-prometheus 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.prometheus diff --git a/python-3.12-image/Dockerfile b/python-3.12-image/Dockerfile index e85c9500a..dd3da6cd0 100644 --- a/python-3.12-image/Dockerfile +++ b/python-3.12-image/Dockerfile @@ -23,7 +23,10 @@ #!BuildVersion: 15.7.3.12 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends python312-devel python312 python312-pip curl findutils gawk git-core procps python312-pipx 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 python312-devel python312 python312-pip curl findutils gawk git-core procps python312-pipx 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.python diff --git a/rmt-mariadb-client-image/Dockerfile b/rmt-mariadb-client-image/Dockerfile index 3aa9d9d8a..e012f869e 100644 --- a/rmt-mariadb-client-image/Dockerfile +++ b/rmt-mariadb-client-image/Dockerfile @@ -23,7 +23,10 @@ #!BuildVersion: 15.7.10.11 FROM suse/sle15:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends mariadb-client; \ + 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.rmt-mariadb-client diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile index 3fa12f6d0..bb9a327fc 100644 --- a/rmt-mariadb-image/Dockerfile +++ b/rmt-mariadb-image/Dockerfile @@ -23,7 +23,10 @@ #!BuildVersion: 15.7.10.11 FROM suse/sle15:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux findutils zstd; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends mariadb mariadb-tools gawk timezone util-linux findutils zstd; \ + 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.rmt-mariadb diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile index be122983d..d5b9212c8 100644 --- a/rmt-server-image/Dockerfile +++ b/rmt-server-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.7 FROM suse/sle15:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends rmt-server catatonit; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends rmt-server catatonit; \ + 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.rmt-server diff --git a/ruby-2.5-image/Dockerfile b/ruby-2.5-image/Dockerfile index 424a6bdf4..8bc740e0b 100644 --- a/ruby-2.5-image/Dockerfile +++ b/ruby-2.5-image/Dockerfile @@ -22,7 +22,10 @@ #!BuildVersion: 15.7.2.5 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends ruby2.5 ruby2.5-rubygem-bundler ruby2.5-devel util-linux gcc-c++ sqlite3-devel make timezone 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 ruby2.5 ruby2.5-rubygem-bundler ruby2.5-devel util-linux gcc-c++ sqlite3-devel make timezone 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.ruby diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile index 0585b27bc..1f232261e 100644 --- a/rust-oldstable-image/Dockerfile +++ b/rust-oldstable-image/Dockerfile @@ -24,7 +24,10 @@ #!BuildVersion: 15.7.1.80.2 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends rust1.80 cargo1.80 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 rust1.80 cargo1.80 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.rust diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile index 5e0ce1bbb..bee38ea25 100644 --- a/rust-stable-image/Dockerfile +++ b/rust-stable-image/Dockerfile @@ -24,7 +24,10 @@ #!BuildVersion: 15.7.1.81.1 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends rust1.81 cargo1.81 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 rust1.81 cargo1.81 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.rust diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile index d1cb67486..91e8611d5 100644 --- a/sac-postfix-image/Dockerfile +++ b/sac-postfix-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.7 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in --no-recommends ca-certificates-mozilla cyrus-sasl cyrus-sasl-plain ed gawk netcfg postfix postfix-ldap postfix-lmdb timezone; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends ca-certificates-mozilla cyrus-sasl cyrus-sasl-plain ed gawk netcfg postfix postfix-ldap postfix-lmdb timezone; \ + 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.postfix diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile index 14a31e307..eb543f6f3 100644 --- a/sle15-kernel-module-devel-image/Dockerfile +++ b/sle15-kernel-module-devel-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.7 FROM bci/bci-base:15.7 -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.sle15-kernel-module-devel diff --git a/sles15-image/config.sh b/sles15-image/config.sh index d3923a513..6ab143165 100644 --- a/sles15-image/config.sh +++ b/sles15-image/config.sh @@ -79,6 +79,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/spack-image/Dockerfile b/spack-image/Dockerfile index 0d8877264..520f832a3 100644 --- a/spack-image/Dockerfile +++ b/spack-image/Dockerfile @@ -22,7 +22,10 @@ #!BuildVersion: 15.7.0.21 FROM bci/bci-base:15.7 -RUN set -euo pipefail; zypper -n in spack bison cmake-full flex libtool makeinfo patchelf lsb-release zstd libzip-devel libcurl-devel libopenssl-devel ncurses-devel tack xz-devel; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install spack bison cmake-full flex libtool makeinfo patchelf lsb-release zstd libzip-devel libcurl-devel libopenssl-devel ncurses-devel tack xz-devel; \ + 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.spack