podman-3.0.0-0.10.el9
- update to the latest content of https://github.com/containers/podman/tree/master (https://github.com/containers/podman/commit/dd295f2) Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy
parent
6834015922
commit
a782eca329
77
8561.patch
77
8561.patch
@ -1,77 +0,0 @@
|
||||
From 95c45773d7dbca2880152de681c81f0a2afec99b Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Heon <mheon@redhat.com>
|
||||
Date: Wed, 2 Dec 2020 15:01:46 -0500
|
||||
Subject: [PATCH] Do not mount sysfs as rootless in more cases
|
||||
|
||||
We can't mount sysfs as rootless unless we manage the network
|
||||
namespace. Problem: slirp4netns is now creating and managing a
|
||||
network namespace separate from the OCI runtime, so we can't
|
||||
mount sysfs in many circumstances. The `crun` OCI runtime will
|
||||
automatically handle this by falling back to a bind mount, but
|
||||
`runc` will not, so we didn't notice until RHEL gating tests ran
|
||||
on the new branch.
|
||||
|
||||
Signed-off-by: Matthew Heon <mheon@redhat.com>
|
||||
---
|
||||
pkg/specgen/generate/oci.go | 2 +-
|
||||
test/e2e/run_memory_test.go | 6 +++---
|
||||
test/e2e/run_test.go | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
|
||||
index 8454458a8a..9649873fd1 100644
|
||||
--- a/pkg/specgen/generate/oci.go
|
||||
+++ b/pkg/specgen/generate/oci.go
|
||||
@@ -165,7 +165,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
|
||||
inUserNS = true
|
||||
}
|
||||
}
|
||||
- if inUserNS && s.NetNS.IsHost() {
|
||||
+ if inUserNS && s.NetNS.NSMode != specgen.NoNetwork {
|
||||
canMountSys = false
|
||||
}
|
||||
|
||||
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go
|
||||
index b3913c1e62..ad3a2b54fd 100644
|
||||
--- a/test/e2e/run_memory_test.go
|
||||
+++ b/test/e2e/run_memory_test.go
|
||||
@@ -38,7 +38,7 @@ var _ = Describe("Podman run memory", func() {
|
||||
var session *PodmanSessionIntegration
|
||||
|
||||
if CGROUPSV2 {
|
||||
- session = podmanTest.Podman([]string{"run", "--memory=40m", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.max"})
|
||||
+ session = podmanTest.Podman([]string{"run", "--memory=40m", "--net=none", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.max"})
|
||||
} else {
|
||||
session = podmanTest.Podman([]string{"run", "--memory=40m", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.limit_in_bytes"})
|
||||
}
|
||||
@@ -55,7 +55,7 @@ var _ = Describe("Podman run memory", func() {
|
||||
var session *PodmanSessionIntegration
|
||||
|
||||
if CGROUPSV2 {
|
||||
- session = podmanTest.Podman([]string{"run", "--memory-reservation=40m", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.low"})
|
||||
+ session = podmanTest.Podman([]string{"run", "--memory-reservation=40m", "--net=none", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.low"})
|
||||
} else {
|
||||
session = podmanTest.Podman([]string{"run", "--memory-reservation=40m", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"})
|
||||
}
|
||||
@@ -81,7 +81,7 @@ var _ = Describe("Podman run memory", func() {
|
||||
var session *PodmanSessionIntegration
|
||||
|
||||
if CGROUPSV2 {
|
||||
- session = podmanTest.Podman([]string{"run", "--memory-reservation=40m", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.low"})
|
||||
+ session = podmanTest.Podman([]string{"run", "--net=none", "--memory-reservation=40m", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/memory.low"})
|
||||
} else {
|
||||
session = podmanTest.Podman([]string{"run", "--memory-reservation=40m", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"})
|
||||
}
|
||||
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
|
||||
index 0d65a3e596..5831bb2f9f 100644
|
||||
--- a/test/e2e/run_test.go
|
||||
+++ b/test/e2e/run_test.go
|
||||
@@ -1267,7 +1267,7 @@ USER mail`
|
||||
It("podman run verify pids-limit", func() {
|
||||
SkipIfCgroupV1("pids-limit not supported on cgroup V1")
|
||||
limit := "4321"
|
||||
- session := podmanTest.Podman([]string{"run", "--pids-limit", limit, "--rm", ALPINE, "cat", "/sys/fs/cgroup/pids.max"})
|
||||
+ session := podmanTest.Podman([]string{"run", "--pids-limit", limit, "--net=none", "--rm", ALPINE, "cat", "/sys/fs/cgroup/pids.max"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session.ExitCode()).To(Equal(0))
|
||||
Expect(session.OutputToString()).To(ContainSubstring(limit))
|
||||
@ -17,14 +17,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
|
||||
|
||||
%global import_path github.com/containers/podman
|
||||
%global branch master
|
||||
%global commit0 0c967319f85101b84631aff158803e3f11a8402b
|
||||
%global commit0 dd295f297b6dd51d22c64c75f4ef4f80f953bbde
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
%global cataver 0.1.5
|
||||
%global dnsnamever 1.0.0
|
||||
|
||||
Name: podman
|
||||
Version: 3.0.0
|
||||
Release: 0.9%{?dist}
|
||||
Release: 0.10%{?dist}
|
||||
Summary: Manage Pods, Containers and Container Images
|
||||
License: ASL 2.0 and GPLv3+
|
||||
URL: https://%{name}.io/
|
||||
@ -35,7 +35,6 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
|
||||
%endif
|
||||
Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
|
||||
Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz
|
||||
Patch1: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/8561.patch
|
||||
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
|
||||
ExclusiveArch: %{go_arches}
|
||||
Provides: %{name}-manpages = %{version}-%{release}
|
||||
@ -340,6 +339,10 @@ exit 0
|
||||
%{_datadir}/%{name}/test
|
||||
|
||||
%changelog
|
||||
* Wed Dec 09 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.10
|
||||
- update to the latest content of https://github.com/containers/podman/tree/master
|
||||
(https://github.com/containers/podman/commit/dd295f2)
|
||||
|
||||
* Mon Dec 07 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.9
|
||||
- disable LTO to fix build
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (v0.1.5.tar.gz) = 75387cf9c611222ef0afc9f688cefb3e4a4ec388cfa9d2329ee7860cb2ad83afa9311f53c1047f92f7adde27b7eb07f5501ee602334e610a3227104d8894486b
|
||||
SHA512 (v1.0.0.tar.gz) = 6eb96939847dcb4bb6fcfbf2e9e1555c1e79b0b77350b2669d4e517decdda1784fbe68536419fd5ba81bfc6b47c57665487c62e5fde7e0d2b129f0161f421b83
|
||||
SHA512 (master-0c96731.tar.gz) = df166a14fcbb586b9d34106b3ab35d16d243c064f26d1622764d4816ca0a09b382a73df6078a9a20b0af835a753262543d6d37d118c9d7fea13b76b6b5ced039
|
||||
SHA512 (master-dd295f2.tar.gz) = ae3a06c84db158294d3f3b191fe57b63c3d0914b8707b2d5f64a40d011653eea0e5b37ddaacb356f3e28bbb75e640322988a101f292c6d625c8a289d551c8968
|
||||
|
||||
Loading…
Reference in New Issue
Block a user