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: v1.2.0
Choose a base ref
...
head repository: opencontainers/runc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.1
Choose a head ref
  • 18 commits
  • 64 files changed
  • 7 contributors

Commits on Oct 21, 2024

  1. [1.2] VERSION: back to development

    Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
    cyphar committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    0ff6451 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. libct/nsenter: become root after joining userns

    Containerd pre-creates userns and netns before calling runc, which
    results in the current code not working when SELinux is enabled,
    resulting in the following error:
    
    > runc create failed: unable to start container process: error during
    container init: error mounting "mqueue" to rootfs at "/dev/mqueue":
    setxattr /path/to/rootfs/dev/mqueue: operation not permitted
    
    The solution is to become root in the user namespace right after
    we join it.
    
    Fixes #4466.
    
    Co-authored-by: Wei Fu <fuweid89@gmail.com>
    Co-authored-by: Kir Kolyshkin <kolyshkin@gmail.com>
    Co-authored-by: Aleksa Sarai <cyphar@cyphar.com>
    Signed-off-by: lifubang <lifubang@acmcoder.com>
    (cherry picked from commit c78f3f2)
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    4 people committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    1eb9ad3 View commit details
    Browse the repository at this point in the history
  2. test join other container userns with selinux enabled

    Signed-off-by: lifubang <lifubang@acmcoder.com>
    (cherry picked from commit 34a9285)
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    lifubang authored and kolyshkin committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    74a5c78 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4477 from kolyshkin/1.2-userns

    [1.2] libct/nsenter: become root after joining userns
    lifubang authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    0e4ee02 View commit details
    Browse the repository at this point in the history
  4. libct: rm x/sys/execabs usage

    Since Go 1.19, the same functionality is there in os/exec package.
    As we require go 1.22 now, there's no need to have this.
    
    This basically reverts commit 9258eac ("libct/start: use execabs for
    newuidmap lookup").
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit eb2ff52)
    Signed-off-by: Austin Vazquez <macedonv@amazon.com>
    kolyshkin authored and austinvazquez committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    f479676 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #4480 from austinvazquez/cherry-pick-eb2ff52ace177…

    …5ad667ca900b2e57e7d698e3484-to-1.2
    
    [1.2] libct: rm x/sys/execabs usage
    kolyshkin authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    989d4e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. drop runc-dmz solution according to overlay solution

    Because we have the overlay solution, we can drop runc-dmz binary
    solution since it has too many limitations.
    
    Signed-off-by: lifubang <lifubang@acmcoder.com>
    (cherry picked from commit 871057d)
    Signed-off-by: lifubang <lifubang@acmcoder.com>
    lifubang committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f07d92d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4488 from lifubang/backport-4482

    [1.2] drop runc-dmz solution according to overlay solution
    kolyshkin authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a0918a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. CHANGELOG: add (forward-port) v1.1.15 changes

    Those are taken from commit bc20cb4.
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    kolyshkin committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    bb71ad5 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge pull request #4493 from kolyshkin/12-4489

    [1.2] CHANGELOG: add (forward-port) v1.1.15 changes
    AkihiroSuda authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    fe36d38 View commit details
    Browse the repository at this point in the history
  2. libct/cg: improve ConvertMemorySwapToCgroupV2Value

    Improve readability of ConvertMemorySwapToCgroupV2Value by switching
    from a bunch of if statements to a switch, and adding a comment
    describing each case.
    
    No functional change.
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit cb9f3d6)
    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    kolyshkin authored and AkihiroSuda committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    914a8f3 View commit details
    Browse the repository at this point in the history
  3. runc update: fix updating swap for cgroup v2

    This allows to do
    
    	runc update $ID --memory=-1 --memory-swap=$VAL
    
    for cgroup v2, i.e. set memory to unlimited and swap to a specific
    value.
    
    This was not possible because ConvertMemorySwapToCgroupV2Value rejected
    memory=-1 ("unlimited"). In a hindsight, it was a mistake, because if
    memory limit is unlimited, we should treat memory+swap limit as just swap
    limit.
    
    Revise the unit test; add description to each case.
    
    Fixes: c86be8a ("cgroupv2: fix setting MemorySwap")
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit 732806e)
    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    kolyshkin authored and AkihiroSuda committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    e0d3953 View commit details
    Browse the repository at this point in the history
  4. script/check-config.sh: add OVERLAY_FS check

    While this is used by the majority of upper container runtimes, it was
    not needed for runc itself. Since commit 515f09f runc uses overlay,
    too, so let's add a check for this.
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit ee1bced)
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    kolyshkin committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    47dfa20 View commit details
    Browse the repository at this point in the history
  5. libct: fix a comment

    There is a typo in the comment (ClonedBinary should be CloneBinary), and
    the code has changed a bit since then, and it makes more sense to refer
    to CloneSelfExe now.
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit 8cc7375)
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    kolyshkin committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    b798594 View commit details
    Browse the repository at this point in the history
  6. libct: rm obsoleted comment

    This was added by commit f2f1621 when runc-dmz was still a thing.
    
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    (cherry picked from commit 5586d7c)
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    kolyshkin committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    258cd8b View commit details
    Browse the repository at this point in the history
  7. Merge pull request #4501 from AkihiroSuda/cherrypick-4357

    [1.2] runc update: fix updating swap for cgroup v2
    kolyshkin authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    3016408 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #4494 from kolyshkin/12-4490

    [1.2] Post overlay addition and dmz removal nits
    rata authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    360f8f9 View commit details
    Browse the repository at this point in the history
  9. VERSION: release v1.2.1

    Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
    Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
    rata authored and cyphar committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    d7735e3 View commit details
    Browse the repository at this point in the history
Loading