diff --git a/.gitignore b/.gitignore index 4634831..3d4c3ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/runc-ad0f525.tar.gz +SOURCES/runc-70ca035.tar.gz diff --git a/.runc.metadata b/.runc.metadata index 6ad09fb..5077e97 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -fbc062e2b0cfe3b3acb1c934714672656fa92c89 SOURCES/runc-ad0f525.tar.gz +40beac6c51e5d46a1c0e00ede9c0cadf6ba206b7 SOURCES/runc-70ca035.tar.gz diff --git a/SOURCES/bz1616112.patch b/SOURCES/bz1616112.patch deleted file mode 100644 index 1dcf669..0000000 --- a/SOURCES/bz1616112.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 26ec8a9783cc5503a3a8928fa6eba5dd3e86ced1 Mon Sep 17 00:00:00 2001 -From: Mrunal Patel -Date: Tue, 14 Aug 2018 15:50:04 -0700 -Subject: [PATCH] Revert "libcontainer/rootfs_linux: minor cleanup" - -This reverts commit 1b27db67f13bccaaa325f8372069e15575988eb9. - -Signed-off-by: Mrunal Patel ---- - libcontainer/rootfs_linux.go | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go -index 7f852efce..cf715d664 100644 ---- a/libcontainer/rootfs_linux.go -+++ b/libcontainer/rootfs_linux.go -@@ -46,6 +46,7 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) { - return newSystemErrorWithCause(err, "preparing rootfs") - } - -+ setupDev := needsSetupDev(config) - for _, m := range config.Mounts { - for _, precmd := range m.PremountCmds { - if err := mountCmd(precmd); err != nil { -@@ -64,8 +65,6 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) { - } - } - -- setupDev := needsSetupDev(config) -- - if setupDev { - if err := createDevices(config); err != nil { - return newSystemErrorWithCause(err, "creating device nodes") diff --git a/SOURCES/change-default-root.patch b/SOURCES/change-default-root.patch index 5fe5f51..02abe94 100644 --- a/SOURCES/change-default-root.patch +++ b/SOURCES/change-default-root.patch @@ -1,5 +1,5 @@ diff --git a/list.go b/list.go -index 0313d8c..328798b 100644 +index 0313d8cc..328798b5 100644 --- a/list.go +++ b/list.go @@ -50,7 +50,7 @@ var listCommand = cli.Command{ @@ -12,7 +12,7 @@ index 0313d8c..328798b 100644 EXAMPLE 1: To list containers created via the default "--root": diff --git a/main.go b/main.go -index 278399a..0f49fce 100644 +index 278399a5..0f49fce1 100644 --- a/main.go +++ b/main.go @@ -62,7 +62,7 @@ func main() { @@ -34,7 +34,7 @@ index 278399a..0f49fce 100644 // XDG_RUNTIME_DIR to have a sticky bit if we don't want it to get // auto-pruned. diff --git a/man/runc-list.8.md b/man/runc-list.8.md -index f737424..107220e 100644 +index f7374244..107220ee 100644 --- a/man/runc-list.8.md +++ b/man/runc-list.8.md @@ -6,7 +6,7 @@ @@ -47,10 +47,10 @@ index f737424..107220e 100644 To list containers created via the default "--root": # runc list diff --git a/man/runc.8.md b/man/runc.8.md -index 6c6d7a5..786a215 100644 +index 6d0ddff6..337bc733 100644 --- a/man/runc.8.md +++ b/man/runc.8.md -@@ -50,7 +50,7 @@ value for "bundle" is the current directory. +@@ -51,7 +51,7 @@ value for "bundle" is the current directory. --debug enable debug output for logging --log value set the log file path where internal debug information is written (default: "/dev/null") --log-format value set the format used by logs ('text' (default), or 'json') (default: "text") @@ -58,4 +58,4 @@ index 6c6d7a5..786a215 100644 + --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc-ctrs" or $XDG_RUNTIME_DIR/runc-ctrs for rootless containers) --criu value path to the criu binary used for checkpoint and restore (default: "criu") --systemd-cgroup enable systemd cgroup support, expects cgroupsPath to be of form "slice:prefix:name" for e.g. "system.slice:runc:434234" - --help, -h show help + --rootless value enable rootless mode ('true', 'false', or 'auto') (default: "auto") diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 914eb0a..e5f2f5f 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -23,12 +23,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://github.com/opencontainers/runc -%global commit0 ad0f5255060d36872be04de22f8731f38ef2d7b1 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global commit0 70ca035aa6ecfc496e13365fdef20383408501ba +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} Version: 1.0.0 -Release: 37.rc5.dev.git%{shortcommit0}%{?dist} +Release: 52.dev.git%{shortcommit0}%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: http//%{provider_prefix} @@ -36,7 +36,6 @@ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: 99-containers.conf Patch0: change-default-root.patch Patch1: 0001-Revert-Apply-cgroups-earlier.patch -Patch2: bz1616112.patch Requires: criu Requires(pre): container-selinux >= 2:2.2-2 @@ -289,6 +288,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Mon Sep 10 2018 Lokesh Mandvekar - 2:1.0.0-52.dev.git70ca035 +- built commit 70ca035 with additional patches to change default root and +to revert apply cgroups earlier + +* Fri Aug 31 2018 Dan Walsh - 2:1.0.0-51.dev.gitfdd8055 +- Fix handling of tmpcopyup + * Tue Aug 14 2018 Lokesh Mandvekar - 2:1.0.0-37.gitad0f525 - Resolves: #1616112