Merge pull request #1746 from SUSE/for-deploy-16.0

🤖: Update build recipes for 16.0
SUSE · Sep 25, 2024 · ffa9d13 · ffa9d13
2 parents 96b14f2 + 850f304
commit ffa9d13
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -20,7 +20,10 @@
 
 FROM bci/bci-base:16.0
 
-RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip SLES-release; zypper -n clean; rm -rf {/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:27 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -22,7 +22,10 @@
 
 FROM bci/bci-base:16.0
 
-RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-repart enchant-devel gcc glibc-devel iproute2 java-21-openjdk-headless jing kiwi-systemdeps-filesystems kpartx libxml2-devel lvm2 make netcat-openbsd python3-devel python3-kiwi python3-pip tack timezone xorriso xz SLES-release; zypper -n clean; rm -rf {/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:27 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/sle16-kernel-module-devel-image/Dockerfile b/sle16-kernel-module-devel-image/Dockerfile
@@ -20,7 +20,10 @@
 
 FROM bci/bci-base:16.0
 
-RUN set -euo pipefail; zypper -n in --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build SLES-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build SLES-release; \
+    zypper -n clean; \
+    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.sle16-kernel-module-devel

diff --git a/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes b/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:36:27 UTC 2024 - Dirk Mueller <[email protected]>
+
+- rerender installation step in multiple lines, allow uninstalling optional packages
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:38 UTC 2024 - Dirk Mueller <[email protected]>