-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Comparing changes
Open a pull request
base repository: opencontainers/runc
base: a251537cbea8eac05d3398199f835590685f3dcb
head repository: opencontainers/runc
compare: 07bdb3e29b14db6acb3a34e2de3e4b8d9084a318
- 12 commits
- 19 files changed
- 5 contributors
Commits on Apr 29, 2020
-
cgroups/fs2: don't always parse /proc/self/cgroup
Function defaultPath always parses /proc/self/cgroup, but the resulting value is not always used. Avoid unnecessary reading/parsing by moving the code to just before its use. Modify the test case accordingly. [v2: test: use UnifiedMountpoint, skip test if not on v2] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for c3b0b13 - Browse repository at this point
Copy the full SHA c3b0b13View commit details -
Merge pull request #2358 from kolyshkin/fs2-nit
cgroups/fs2: don't always parse /proc/self/cgroup
Mrunal Patel authoredApr 29, 2020 Configuration menu - View commit details
-
Copy full SHA for dd8d48e - Browse repository at this point
Copy the full SHA dd8d48eView commit details
Commits on May 2, 2020
-
Dockerfile: bump criu to version π (3.14)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 9634a80 - Browse repository at this point
Copy the full SHA 9634a80View commit details -
Vagrantfile: use criu 3.14 from testing
...just to test the new package. This complexity is temporary: once criu-3.14 will be moved from testing to stable, this will be removed. Also remove criu build deps as we're no longer building it from source. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for e9e31f7 - Browse repository at this point
Copy the full SHA e9e31f7View commit details -
Vagrantfile: install less packages
1. Disable updating the kernel (we're not going to reboot into it anyway) 2. Disable weak dependencies (that includes git, svn and a ton of perl modules). 3. Add git-core to list of packages since it is used from Makefile. Before: default: Transaction Summary default: ================================================================================ default: Install 123 Packages default: Upgrade 63 Packages default: Total size: 326 M default: Total download size: 326 M After: default: Transaction Summary default: ================================================================================ default: Install 53 Packages default: Upgrade 63 Packages default: Total size: 181 M default: Total download size: 180 M Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for d2061ee - Browse repository at this point
Copy the full SHA d2061eeView commit details
Commits on May 3, 2020
-
libcontainer: don't double-quote errors
genericError.Error() was formatting the underlying error using `%q`; as a result, quotes in underlying errors were escaped multiple times, which caused the output to become hard to read, for example (wrapped for readability): ``` container_linux.go:345: starting container process caused "process_linux.go:430: container init caused \"rootfs_linux.go:58: mounting \\\"/foo.txt\\\" to rootfs \\\"/var/lib/docker/overlay2/f49a0ae0ec6646c818dcf05dbcbbdd79fc7c42561f3684fbb1fc5d2b9d3ad192/merged\\\" at \\\"/var/lib/docker/overlay2/f49a0ae0ec6646c818dcf05dbcbbdd79fc7c42561f3684fbb1fc5d2b9d3ad192/merged/usr/share/nginx/html\\\" caused \\\"not a directory\\\"\"": unknown ``` With this patch applied: ``` container_linux.go:348: starting container process caused: process_linux.go:438: container init caused: rootfs_linux.go:58: mounting "/foo.txt" to rootfs "/var/lib/docker/overlay2/de506d67da606b807009e23b548fec60d72359c77eec88785d8c7ecd54a6e4b2/merged" at "/var/lib/docker/overlay2/de506d67da606b807009e23b548fec60d72359c77eec88785d8c7ecd54a6e4b2/merged/usr/share/nginx/html" caused: not a directory: unknown ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Configuration menu - View commit details
-
Copy full SHA for 2adfd20 - Browse repository at this point
Copy the full SHA 2adfd20View commit details -
libcontainer: simplify error message
The error message was including both the rootfs path, and the full mount path, which also includes the path of the rootfs. This patch removes the rootfs path from the error message, as it was redundant, and made the error message overly verbose Before this patch (errors wrapped for readability): ``` container_linux.go:348: starting container process caused: process_linux.go:438: container init caused: rootfs_linux.go:58: mounting "/foo.txt" to rootfs "/var/lib/docker/overlay2/de506d67da606b807009e23b548fec60d72359c77eec88785d8c7ecd54a6e4b2/merged" at "/var/lib/docker/overlay2/de506d67da606b807009e23b548fec60d72359c77eec88785d8c7ecd54a6e4b2/merged/usr/share/nginx/html" caused: not a directory: unknown ``` With this patch applied: ``` container_linux.go:348: starting container process caused: process_linux.go:438: container init caused: rootfs_linux.go:58: mounting "/foo.txt" to rootfs at "/var/lib/docker/overlay2/de506d67da606b807009e23b548fec60d72359c77eec88785d8c7ecd54a6e4b2/merged/usr/share/nginx/html" caused: not a directory: unknown ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Configuration menu - View commit details
-
Copy full SHA for 64ca548 - Browse repository at this point
Copy the full SHA 64ca548View commit details -
Merge pull request #2372 from thaJeztah/improve_error_readability
Improve readability of errors
Configuration menu - View commit details
-
Copy full SHA for f6439a8 - Browse repository at this point
Copy the full SHA f6439a8View commit details -
Close fd in case fd.Write() returns error
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for db29dce - Browse repository at this point
Copy the full SHA db29dceView commit details -
Merge pull request #2375 from tedyu/wait-lazy-close
Close fd in case fd.Write() returns error
Mrunal Patel authoredMay 3, 2020 Configuration menu - View commit details
-
Copy full SHA for 6161d25 - Browse repository at this point
Copy the full SHA 6161d25View commit details -
Configuration menu - View commit details
-
Copy full SHA for 609ba79 - Browse repository at this point
Copy the full SHA 609ba79View commit details -
cgroup v2: support rootless systemd
Tested with both Podman (master) and Moby (master), on Ubuntu 19.10 . $ podman --cgroup-manager=systemd run -it --rm --runtime=runc \ --cgroupns=host --memory 42m --cpus 0.42 --pids-limit 42 alpine / # cat /proc/self/cgroup 0::/user.slice/user-1001.slice/user@1001.service/user.slice/libpod-132ff0d72245e6f13a3bbc6cdc5376886897b60ac59eaa8dea1df7ab959cbf1c.scope / # cat /sys/fs/cgroup/user.slice/user-1001.slice/user@1001.service/user.slice/libpod-132ff0d72245e6f13a3bbc6cdc5376886897b60ac59eaa8dea1df7ab959cbf1c.scope/memory.max 44040192 / # cat /sys/fs/cgroup/user.slice/user-1001.slice/user@1001.service/user.slice/libpod-132ff0d72245e6f13a3bbc6cdc5376886897b60ac59eaa8dea1df7ab959cbf1c.scope/cpu.max 42000 100000 / # cat /sys/fs/cgroup/user.slice/user-1001.slice/user@1001.service/user.slice/libpod-132ff0d72245e6f13a3bbc6cdc5376886897b60ac59eaa8dea1df7ab959cbf1c.scope/pids.max 42 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Configuration menu - View commit details
-
Copy full SHA for 07bdb3e - Browse repository at this point
Copy the full SHA 07bdb3eView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff a251537cbea8eac05d3398199f835590685f3dcb...07bdb3e29b14db6acb3a34e2de3e4b8d9084a318