Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[failed 26.0 backport - wrong branch] Restore the SetKey prestart hook. #47635

Merged

Commits on Mar 27, 2024

  1. Restore the SetKey prestart hook.

    Partially reverts 0046b16 "daemon: set libnetwork sandbox key w/o OCI hook"
    
    Running SetKey to store the OCI Sandbox key after task creation, rather
    than from the OCI prestart hook, meant it happened after sysctl settings
    were applied by the runtime - which was the intention, we wanted to
    complete Sandbox configuration after IPv6 had been disabled by a sysctl
    if that was going to happen.
    
    But, it meant '--sysctl' options for a specfic network interface caused
    container task creation to fail, because the interface is only moved into
    the network namespace during SetKey.
    
    This change restores the SetKey prestart hook, and regenerates config
    files that depend on the container's support for IPv6 after the task has
    been created. It also adds a regression test that makes sure it's possible
    to set an interface-specfic sysctl.
    
    Signed-off-by: Rob Murray <rob.murray@docker.com>
    robmry committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    1014f48 View commit details
    Browse the repository at this point in the history