From fa7145b229f4a4940600d491fd4bdf67094674483ef2c89fcec9a717134fc31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 24 Mar 2023 07:58:08 +0000 Subject: [PATCH] Accepting request 1074043 from home:danishprakash:branches:devel:microos - Update to version 4.4.3: * Bump to v4.4.3 OBS-URL: https://build.opensuse.org/request/show/1074043 OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=20 --- Quadlet-use-the-default-runtime.patch | 60 --------------------------- _service | 2 +- _servicedata | 2 +- podman-4.4.2.tar.xz | 3 -- podman-4.4.3.tar.xz | 3 ++ podman.changes | 29 +++++++++++++ podman.spec | 3 +- 7 files changed, 35 insertions(+), 67 deletions(-) delete mode 100644 Quadlet-use-the-default-runtime.patch delete mode 100644 podman-4.4.2.tar.xz create mode 100644 podman-4.4.3.tar.xz diff --git a/Quadlet-use-the-default-runtime.patch b/Quadlet-use-the-default-runtime.patch deleted file mode 100644 index 3abf28d..0000000 --- a/Quadlet-use-the-default-runtime.patch +++ /dev/null @@ -1,60 +0,0 @@ -From df0fe4fcc7d54a1a8801f74bfac430f9986f0722 Mon Sep 17 00:00:00 2001 -From: Ygal Blum -Date: Wed, 22 Feb 2023 09:36:20 +0200 -Subject: [PATCH] Quadlet - use the default runtime -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not set the runtime when processing a .container file -Let Podman choose the runtime based on its configuration - -Signed-off-by: Ygal Blum -Signed-off-by: Dan Čermák -(cherry picked from commit 0d75854c52e646f4c83a7a4389d8c4aebbb7ee5c) ---- - pkg/systemd/quadlet/quadlet.go | 6 ++---- - test/e2e/quadlet/basepodman.container | 2 +- - test/e2e/quadlet/basic.container | 1 - - 3 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go -index 8724eb0e156..091fcb76d46 100644 ---- a/pkg/systemd/quadlet/quadlet.go -+++ b/pkg/systemd/quadlet/quadlet.go -@@ -295,11 +295,9 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile - "--log-driver", "passthrough", - ) - -- // We use crun as the runtime and delegated groups to it -+ // We delegate groups to the runtime - service.Add(ServiceGroup, "Delegate", "yes") -- podman.add( -- "--runtime", "/usr/bin/crun", -- "--cgroups=split") -+ podman.add("--cgroups=split") - - timezone, ok := container.Lookup(ContainerGroup, KeyTimezone) - if ok && len(timezone) > 0 { -diff --git a/test/e2e/quadlet/basepodman.container b/test/e2e/quadlet/basepodman.container -index 91e12ceb9ca..1e2c34141ab 100644 ---- a/test/e2e/quadlet/basepodman.container -+++ b/test/e2e/quadlet/basepodman.container -@@ -1,4 +1,4 @@ --## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon -d localhost/imagename -+## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --cgroups=split --sdnotify=conmon -d localhost/imagename - - [Container] - Image=localhost/imagename -diff --git a/test/e2e/quadlet/basic.container b/test/e2e/quadlet/basic.container -index 794ded61e34..af2c325d593 100644 ---- a/test/e2e/quadlet/basic.container -+++ b/test/e2e/quadlet/basic.container -@@ -5,7 +5,6 @@ - ## assert-podman-args "--replace" - ## assert-podman-args "-d" - ## assert-podman-args "--log-driver" "passthrough" --## assert-podman-args "--runtime" "/usr/bin/crun" - ## assert-podman-args "--cgroups=split" - ## assert-podman-args "--sdnotify=conmon" - ## assert-key-is "Unit" "RequiresMountsFor" "%t/containers" diff --git a/_service b/_service index 207723b..21de360 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/containers/podman.git git - v4.4.2 + v4.4.3 @PARENT_TAG@ enable v(.*) diff --git a/_servicedata b/_servicedata index de87e65..e783232 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/containers/podman.git - 74afe26887f814d1c39925a1624851ef3590e79c \ No newline at end of file + d2f93d621a491dee547667b6b67184ae7d3fe919 \ No newline at end of file diff --git a/podman-4.4.2.tar.xz b/podman-4.4.2.tar.xz deleted file mode 100644 index 61c5420..0000000 --- a/podman-4.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11ffd53834db864d08a9757514a9cc28f696cb37a0da3b0036c90707c19591d9 -size 8808284 diff --git a/podman-4.4.3.tar.xz b/podman-4.4.3.tar.xz new file mode 100644 index 0000000..5a814d6 --- /dev/null +++ b/podman-4.4.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8efbc8b6485e45825a5d3642e2e7100cfbcbac37f69953be2d7e44e00b21a44 +size 8818784 diff --git a/podman.changes b/podman.changes index 7d0c892..69dee90 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Mar 24 04:56:25 UTC 2023 - Danish Prakash + +- Update to version 4.4.3: + * Bump to v4.4.3 + * Release notes for v4.4.3 + * compat: /auth: parse server address correctly + * vendor github.com/containers/common@v0.51.1 + * pkginstaller: bump Qemu to version 7.2.0 + * podman machine: Adjust Chrony makestep config + * [v4.4] fix --health-on-failure=restart in transient unit + * podman logs passthrough driver support --cgroups=split + * journald logs: simplify entry parsing + * podman logs: read journald with passthrough + * journald: remove initializeJournal() + * netavark: only use aardvark ip as nameserver + * compat API: network create return 409 for duplicate + * fix "podman logs --since --follow" flake + * system service --log-level=trace: support hijack + * podman-mac-helper: exit 1 on error + * bump golang.org/x/net to v0.8.0 + * Fix package restore + * Quadlet - use the default runtime + * Bump to v4.4.3-dev + +- Remove patch (merged upstream): + * Quadlet-use-the-default-runtime.patch + (https://github.com/containers/podman/pull/17601) + ------------------------------------------------------------------- Mon Feb 27 13:54:33 UTC 2023 - Dan Čermák diff --git a/podman.spec b/podman.spec index c08d7e0..e09cdc2 100644 --- a/podman.spec +++ b/podman.spec @@ -18,7 +18,7 @@ %{!?_user_tmpfilesdir: %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d} %define project github.com/containers/podman Name: podman -Version: 4.4.2 +Version: 4.4.3 Release: 0 Summary: Daemon-less container engine for managing containers, pods and images License: Apache-2.0 @@ -27,7 +27,6 @@ URL: https://%{project} Source0: %{name}-%{version}.tar.xz Source1: podman.conf Source2: README.SUSE.SLES -Patch0: https://github.com/containers/podman/pull/17641.patch#./Quadlet-use-the-default-runtime.patch BuildRequires: bash-completion BuildRequires: cni BuildRequires: device-mapper-devel