From b9d23ace8591d92cff860673c6083d74fe7f6f6a Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 19 Sep 2024 13:25:47 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config | 3 +-- init-image/Dockerfile | 2 +- kiwi-image/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_config b/_config index efe02c009..4248a562f 100644 --- a/_config +++ b/_config @@ -15,6 +15,7 @@ Binarytype: rpm %else %if "%_repository" == "containerfile" Type: docker +BuildEngine: podman PreInstall: cni %else @@ -44,8 +45,6 @@ Ignore: krb5-mini:this-is-only-for-build-envs BuildFlags: excludebuild:rpm Prefer: -postgresql16-devel-mini -Prefer: -ALP-dummy-release -Prefer: -SLES-SAP-release # prevent gdb from pulling in python 3.11 & 3.12 at the same time Substitute: obs:cli_debug_packages less diff --git a/init-image/Dockerfile b/init-image/Dockerfile index 4d627786e..127c68787 100644 --- a/init-image/Dockerfile +++ b/init-image/Dockerfile @@ -20,7 +20,7 @@ FROM bci/bci-base:16.0 -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 SLES-release; 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=com.suse.bci.init diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile index 1fe5a15e7..545212cce 100644 --- a/kiwi-image/Dockerfile +++ b/kiwi-image/Dockerfile @@ -24,7 +24,7 @@ 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; 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 SLES-release; 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=com.suse.bci.kiwi From f8573d3cf9bd3110a925e3fe87b00c79cf77a900 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 19 Sep 2024 13:41:14 +0000 Subject: [PATCH 2/2] Update changelogs for init-image, kiwi-image --- init-image/init-image.changes | 5 +++++ kiwi-image/kiwi-image.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/init-image/init-image.changes b/init-image/init-image.changes index a16948577..e146b5d12 100644 --- a/init-image/init-image.changes +++ b/init-image/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 19 13:41:14 UTC 2024 - Dirk Mueller + +- install SLES-release to avoid have-choice errors + ------------------------------------------------------------------- Thu Sep 12 10:37:09 UTC 2024 - Dirk Mueller diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes index 4b29f7ea9..69446781a 100644 --- a/kiwi-image/kiwi-image.changes +++ b/kiwi-image/kiwi-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 19 13:41:14 UTC 2024 - Dirk Mueller + +- install SLES-release to avoid have-choice errors + ------------------------------------------------------------------- Wed Sep 18 15:53:47 UTC 2024 - Dirk Mueller