Merge pull request #1748 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Sep 25, 2024 · 1ae0756 · 1ae0756
2 parents 2950455 + 1950edc
commit 1ae0756
Show file tree

Hide file tree

Showing 74 changed files with 334 additions and 37 deletions.
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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -23,7 +23,10 @@
 #!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 {/target,}/var/log/{alternatives.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
@@ -24,7 +24,10 @@
 #!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 {/target,}/var/log/{alternatives.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/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/base-fips-image/Dockerfile b/base-fips-image/Dockerfile
@@ -22,7 +22,10 @@
 #!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 {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -24,7 +24,10 @@
 #!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 {/target,}/var/log/{alternatives.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/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -23,7 +23,10 @@
 #!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 {/target,}/var/log/{alternatives.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-13-image/gcc-13-image.changes b/gcc-13-image/gcc-13-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -22,7 +22,10 @@
 #!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 {/target,}/var/log/{alternatives.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/gcc-7-image/gcc-7-image.changes b/gcc-7-image/gcc-7-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -25,7 +25,10 @@
 #!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 {/target,}/var/log/{alternatives.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

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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -25,7 +25,10 @@
 #!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 {/target,}/var/log/{alternatives.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

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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -26,7 +26,10 @@
 #!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 {/target,}/var/log/{alternatives.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

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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -26,7 +26,10 @@
 #!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 {/target,}/var/log/{alternatives.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

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:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -25,7 +25,10 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-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}
+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/grafana-image/grafana-image.changes b/grafana-image/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.6
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip sles-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.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/init-image/init-image.changes b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildVersion: 15.6.9
 FROM bci/bci-base:15.6
 
-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 {/target,}/var/log/{alternatives.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/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -23,7 +23,10 @@
 #!BuildRelease: 35
 FROM suse/sle15:15.6
 
-RUN set -euo pipefail; zypper -n in --no-recommends gawk nginx findutils gettext-runtime; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.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/nginx-image/nginx-image.changes b/nginx-image/nginx-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -28,7 +28,10 @@
 #!BuildRelease: 30
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --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}
+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/nodejs-20-image/nodejs-20-image.changes b/nodejs-20-image/nodejs-20-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.6.21
 FROM bci/openjdk:21
 
-RUN set -euo pipefail; zypper -n in --no-recommends java-21-openjdk-devel maven; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.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-devel-image/openjdk-21-devel-image.changes b/openjdk-21-devel-image/openjdk-21-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile
@@ -22,7 +22,10 @@
 #!BuildVersion: 15.6.21
 FROM bci/bci-base:15.6
 
-RUN set -euo pipefail; zypper -n in --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}
+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/openjdk-21-image/openjdk-21-image.changes b/openjdk-21-image/openjdk-21-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -25,7 +25,10 @@
 #!BuildRelease: 35
 FROM bci/bci-init:15.6
 
-RUN set -euo pipefail; zypper -n in --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}
+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/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
@@ -24,7 +24,10 @@
 #!BuildRelease: 30
 FROM bci/bci-base:15.6
 
-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 {/target,}/var/log/{alternatives.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-apache8-image/php-apache8-image.changes b/php-apache8-image/php-apache8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:41 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:22 UTC 2024 - Dirk Mueller <[email protected]>