Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This also adds a fix for containers/podman#21117 which will be submitted upstream soon (credit to Ben Cooksley from KDE for that one).
- Loading branch information
Doug Rabson
authored and
Doug Rabson
committed
Jan 11, 2024
1 parent
ab0dfa3
commit 094c6d2
Showing
5 changed files
with
21 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1699000346 | ||
SHA256 (containers-podman-v4.7.2_GH0.tar.gz) = 10346c5603546427bd809b4d855d1e39b660183232309128ad17a64969a0193d | ||
SIZE (containers-podman-v4.7.2_GH0.tar.gz) = 20554551 | ||
TIMESTAMP = 1704471600 | ||
SHA256 (containers-podman-v4.8.3_GH0.tar.gz) = 3a99b6c82644fa52929cf4143943c63d6784c84094892bc0e14197fa38a1c7fa | ||
SIZE (containers-podman-v4.8.3_GH0.tar.gz) = 21565162 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- libpod/container_inspect.go.orig 2024-01-07 16:19:52 UTC | ||
+++ libpod/container_inspect.go | ||
@@ -316,7 +316,7 @@ func (c *Container) GetSecurityOptions() []string { | ||
if apparmor, ok := ctrSpec.Annotations[define.InspectAnnotationApparmor]; ok { | ||
SecurityOpt = append(SecurityOpt, fmt.Sprintf("apparmor=%s", apparmor)) | ||
} | ||
- if c.config.Spec.Linux.MaskedPaths == nil { | ||
+ if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil { | ||
SecurityOpt = append(SecurityOpt, "unmask=all") | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
podman (Pod Manager) is a fully featured container engine that is a | ||
simple daemonless tool. podman provides a Docker-CLI comparable | ||
Podman (Pod Manager) is a fully featured container engine that is a | ||
simple daemonless tool. Podman provides a Docker-CLI comparable | ||
command line that eases the transition from other container engines | ||
and allows the management of pods, containers and images. Simply put: | ||
alias docker=podman. | ||
|
||
podman uses Buildah(1) internally to create container images. Both | ||
Podman uses Buildah(1) internally to create container images. Both | ||
tools share image (not container) storage, hence each can use or | ||
manipulate images (but not containers) created by the other. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters