Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencontainers/runc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a251537cbea8eac05d3398199f835590685f3dcb
Choose a base ref
...
head repository: opencontainers/runc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07bdb3e29b14db6acb3a34e2de3e4b8d9084a318
Choose a head ref
  • 12 commits
  • 19 files changed
  • 5 contributors

Commits on Apr 29, 2020

  1. 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>
    kolyshkin committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    c3b0b13 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2358 from kolyshkin/fs2-nit

    cgroups/fs2: don't always parse /proc/self/cgroup
    Mrunal Patel authored Apr 29, 2020
    Configuration menu
    Copy the full SHA
    dd8d48e View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. Dockerfile: bump criu to version π (3.14)

    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    kolyshkin committed May 2, 2020
    Configuration menu
    Copy the full SHA
    9634a80 View commit details
    Browse the repository at this point in the history
  2. 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>
    kolyshkin committed May 2, 2020
    Configuration menu
    Copy the full SHA
    e9e31f7 View commit details
    Browse the repository at this point in the history
  3. 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>
    kolyshkin committed May 2, 2020
    Configuration menu
    Copy the full SHA
    d2061ee View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. 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>
    thaJeztah committed May 3, 2020
    Configuration menu
    Copy the full SHA
    2adfd20 View commit details
    Browse the repository at this point in the history
  2. 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>
    thaJeztah committed May 3, 2020
    Configuration menu
    Copy the full SHA
    64ca548 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2372 from thaJeztah/improve_error_readability

    Improve readability of errors
    kolyshkin authored May 3, 2020
    Configuration menu
    Copy the full SHA
    f6439a8 View commit details
    Browse the repository at this point in the history
  4. Close fd in case fd.Write() returns error

    Signed-off-by: Ted Yu <yuzhihong@gmail.com>
    tedyu committed May 3, 2020
    Configuration menu
    Copy the full SHA
    db29dce View commit details
    Browse the repository at this point in the history
  5. Merge pull request #2375 from tedyu/wait-lazy-close

    Close fd in case fd.Write() returns error
    Mrunal Patel authored May 3, 2020
    Configuration menu
    Copy the full SHA
    6161d25 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #2371 from kolyshkin/criu314

    Use criu 3.14
    Mrunal Patel authored May 3, 2020
    Configuration menu
    Copy the full SHA
    609ba79 View commit details
    Browse the repository at this point in the history
  7. 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>
    AkihiroSuda committed May 3, 2020
    Configuration menu
    Copy the full SHA
    07bdb3e View commit details
    Browse the repository at this point in the history
Loading