This commit is contained in:
parent
f4e0799fbb
commit
c6750aa1a1
2
_service
2
_service
@ -8,7 +8,7 @@
|
|||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="filename">runc</param>
|
<param name="filename">runc</param>
|
||||||
<param name="versionformat">git.%h</param>
|
<param name="versionformat">git.%h</param>
|
||||||
<param name="revision">2f7393a47307a16f8cee44a37b262e8b81021e3e</param>
|
<param name="revision">9c2d8d184e5da67c95d601382adf14862e4f2228</param>
|
||||||
<param name="exclude">.git</param>
|
<param name="exclude">.git</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
From e7b57cb042130edf86506d189734018edc3f2c18 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mrunal Patel <mrunalp@gmail.com>
|
|
||||||
Date: Tue, 10 Jan 2017 15:13:28 -0800
|
|
||||||
Subject: [PATCH] Ignore cgroup2 mountpoints
|
|
||||||
|
|
||||||
Our current cgroup parsing logic assumes cgroup v1 mounts
|
|
||||||
so we should ignore cgroup2 mounts for now
|
|
||||||
|
|
||||||
Backport: https://github.com/opencontainers/runc/pull/1266
|
|
||||||
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
|
|
||||||
Signed-off-by: Aleksa Sarai <asarai@suse.de>
|
|
||||||
---
|
|
||||||
libcontainer/cgroups/utils.go | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
|
|
||||||
index 8946dd5959e4..c6db0039e654 100644
|
|
||||||
--- a/libcontainer/cgroups/utils.go
|
|
||||||
+++ b/libcontainer/cgroups/utils.go
|
|
||||||
@@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount,
|
|
||||||
if sepIdx == -1 {
|
|
||||||
return nil, fmt.Errorf("invalid mountinfo format")
|
|
||||||
}
|
|
||||||
- if txt[sepIdx+3:sepIdx+9] != "cgroup" {
|
|
||||||
+ if txt[sepIdx+3:sepIdx+10] == "cgroup2" || txt[sepIdx+3:sepIdx+9] != "cgroup" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
fields := strings.Split(txt, " ")
|
|
||||||
--
|
|
||||||
2.12.2
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ada7533b8a684ffde5a7b45517573bdae3a501cc3460107a0deb1e290f040bb0
|
|
||||||
size 413492
|
|
3
runc-git.9c2d8d1.tar.xz
Normal file
3
runc-git.9c2d8d1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d7dda7c4b4d031fd0f32423fc01e5199ef204a0edf1ed3d70992e7e30ea473a2
|
||||||
|
size 413996
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 13 16:34:03 UTC 2017 - jmassaguerpla@suse.com
|
||||||
|
|
||||||
|
- update version to the one required by docker-17.04.0-ce (bsc#1034053)
|
||||||
|
remove ignore_cgroup2_mountpoint.patch . This is already included in
|
||||||
|
the upstream source code.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 12 09:55:28 UTC 2017 - jmassaguerpla@suse.com
|
Wed Apr 12 09:55:28 UTC 2017 - jmassaguerpla@suse.com
|
||||||
|
|
||||||
|
@ -22,13 +22,13 @@
|
|||||||
# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into
|
# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into
|
||||||
# a separate package. This whole versioning mess is caused by
|
# a separate package. This whole versioning mess is caused by
|
||||||
# Docker vendoring non-releases of runC.
|
# Docker vendoring non-releases of runC.
|
||||||
%define git_version 2f7393a
|
%define git_version 9c2d8d1
|
||||||
# How to get the git_revision
|
# How to get the git_revision
|
||||||
# git clone ${url}.git runc-upstream
|
# git clone ${url}.git runc-upstream
|
||||||
# cd runc-upstream
|
# cd runc-upstream
|
||||||
# git checkout $git_version
|
# git checkout $git_version
|
||||||
# git_revision=r$(git rev-list HEAD | wc -l)
|
# git_revision=r$(git rev-list HEAD | wc -l)
|
||||||
%define git_revision r2942
|
%define git_revision r2947
|
||||||
%define version_unconverted %{git_version}
|
%define version_unconverted %{git_version}
|
||||||
|
|
||||||
Name: runc
|
Name: runc
|
||||||
@ -40,7 +40,6 @@ Group: System/Management
|
|||||||
Url: https://github.com/opencontainers/runc
|
Url: https://github.com/opencontainers/runc
|
||||||
Source: %{name}-git.%{git_version}.tar.xz
|
Source: %{name}-git.%{git_version}.tar.xz
|
||||||
Patch0: CVE-2016-9962.patch
|
Patch0: CVE-2016-9962.patch
|
||||||
Patch1: ignore_cgroup2_mountpoint.patch
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
# Make sure we require go 1.7
|
# Make sure we require go 1.7
|
||||||
BuildRequires: go < 1.8
|
BuildRequires: go < 1.8
|
||||||
@ -83,9 +82,6 @@ Test package for runc. It contains the source code and the tests.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-git.%{git_version}
|
%setup -q -n %{name}-git.%{git_version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%if 0%{?suse_version} > 1320
|
|
||||||
%patch1 -p1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Do not use symlinks. If you want to run the unit tests for this package at
|
# Do not use symlinks. If you want to run the unit tests for this package at
|
||||||
|
Loading…
Reference in New Issue
Block a user