Date: Sun, 1 Sep 2024 12:34:44 GMT From: Doug Rabson <dfr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f570a53c118d - main - sysutils/podman: minor fix to the output of 'podman inspect' Message-ID: <202409011234.481CYiJI045345@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=f570a53c118d2232e23509c4e3102ebee2366362 commit f570a53c118d2232e23509c4e3102ebee2366362 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2024-08-28 12:56:45 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2024-09-01 12:33:08 +0000 sysutils/podman: minor fix to the output of 'podman inspect' The HostConfig.Devices field was set to null which confused some code in ansible's podman_container module which expects this field to be an array of srtings. --- sysutils/podman/Makefile | 2 +- .../files/patch-libpod_container__inspect__freebsd.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 22743dcddeab..1f04f72cda93 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,7 @@ PORTNAME= podman DISTVERSIONPREFIX= v DISTVERSION= 5.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go b/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go new file mode 100644 index 000000000000..476307704a41 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go @@ -0,0 +1,17 @@ +--- libpod/container_inspect_freebsd.go.orig 2024-06-04 19:54:07 UTC ++++ libpod/container_inspect_freebsd.go +@@ -15,5 +15,14 @@ func (c *Container) platformInspectContainerHostConfig + // UTS namespace mode + hostConfig.UTSMode = c.NamespaceMode(spec.UTSNamespace, ctrSpec) + ++ // Devices ++ // Do not include if privileged - assumed that all devices will be ++ // included. ++ var err error ++ hostConfig.Devices, err = c.GetDevices(hostConfig.Privileged, *ctrSpec, map[string]string{}) ++ if err != nil { ++ return err ++ } ++ + return nil + }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409011234.481CYiJI045345>