forked from pool/podman
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
This commit is contained in:
Git OBS Bridge
parent
6d6bcc24a1
commit
fa7145b229
@ -1,60 +0,0 @@
|
||||
From df0fe4fcc7d54a1a8801f74bfac430f9986f0722 Mon Sep 17 00:00:00 2001
|
||||
From: Ygal Blum <ygal.blum@gmail.com>
|
||||
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 <ygal.blum@gmail.com>
|
||||
Signed-off-by: Dan Čermák <dcermak@suse.com>
|
||||
(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"
|
||||
2
_service
2
_service
@ -2,7 +2,7 @@
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/containers/podman.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">v4.4.2</param>
|
||||
<param name="revision">v4.4.3</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/containers/podman.git</param>
|
||||
<param name="changesrevision">74afe26887f814d1c39925a1624851ef3590e79c</param></service></servicedata>
|
||||
<param name="changesrevision">d2f93d621a491dee547667b6b67184ae7d3fe919</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:11ffd53834db864d08a9757514a9cc28f696cb37a0da3b0036c90707c19591d9
|
||||
size 8808284
|
||||
3
podman-4.4.3.tar.xz
Normal file
3
podman-4.4.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d8efbc8b6485e45825a5d3642e2e7100cfbcbac37f69953be2d7e44e00b21a44
|
||||
size 8818784
|
||||
@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 24 04:56:25 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
|
||||
|
||||
- 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 <dcermak@suse.com>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user