Merge pull request #1697 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Sep 19, 2024 · 1beb260 · 1beb260
2 parents 19d3304 + e10da68
commit 1beb260
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -21,7 +21,7 @@
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip openSUSE-release openSUSE-release-appliance-docker; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.init

diff --git a/init-image/init-image.changes b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 15:50:17 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install openSUSE-release package to avoid have-choice errors
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -25,7 +25,7 @@
 
 FROM opensuse/tumbleweed:latest
 
-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; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+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 openSUSE-release openSUSE-release-appliance-docker; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.kiwi

diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 15:50:17 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install openSUSE-release package to avoid have-choice errors
+
 -------------------------------------------------------------------
 Wed Sep 18 16:34:21 UTC 2024 - Dirk Müller <[email protected]>