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: moby/moby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 061aa95809be
Choose a base ref
...
head repository: moby/moby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e63daec8672d
Choose a head ref
  • 14 commits
  • 14 files changed
  • 8 contributors

Commits on Mar 7, 2024

  1. builder-next: fix missing lock in ensurelayer

    When this was called concurrently from the moby image
    exporter there could be a data race where a layer was
    written to the refs map when it was already there.
    
    In that case the reference count got mixed up and on
    release only one of these layers was actually released.
    
    Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
    (cherry picked from commit 37545cc)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    tonistiigi authored and vvoland committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    d250e13 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #47527 from vvoland/v25.0-47523

    [25.0 backport] builder-next: fix missing lock in ensurelayer
    neersighted authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    98b171f View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. volume: Don't decrement refcount below 0

    With both rootless and live restore enabled, there's some race condition
    which causes the container to be `Unmount`ed before the refcount is
    restored.
    
    This makes sure we don't underflow the refcount (uint64) when
    decrementing it.
    
    The root cause of this race condition still needs to be investigated and
    fixed, but at least this unflakies the `TestLiveRestore`.
    
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    (cherry picked from commit 294fc97)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    vvoland committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    478f6b0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #47533 from vvoland/v25.0-47530

    [25.0 backport] volume: Don't decrement refcount below 0
    thaJeztah authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5901652 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Makefile: generate-files: fix check for empty TMP_OUT

    commit c655b7d added a check to make sure
    the TMP_OUT variable was not set to an empty value, as such a situation would
    perform an `rm -rf /**` during cleanup.
    
    However, it was a bit too eager, because Makefile conditionals (`ifeq`) are
    evaluated when parsing the Makefile, which happens _before_ the make target
    is executed.
    
    As a result `$@_TMP_OUT` was always empty when the `ifeq` was evaluated,
    making it not possible to execute the `generate-files` target.
    
    This patch changes the check to use a shell command to evaluate if the var
    is set to an empty value.
    
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    (cherry picked from commit 25c9e6e)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    thaJeztah authored and vvoland committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    02d4ee3 View commit details
    Browse the repository at this point in the history
  2. rootless: fix open /etc/docker/plugins: permission denied

    Fix issue 47436
    
    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    (cherry picked from commit d742659)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    AkihiroSuda authored and vvoland committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    81ad706 View commit details
    Browse the repository at this point in the history
  3. plugin: fix mounting /etc/hosts when running in UserNS

    Fix `error mounting "/etc/hosts" to rootfs at "/etc/hosts": mount
    /etc/hosts:/etc/hosts (via /proc/self/fd/6), flags: 0x5021: operation
    not permitted`.
    
    This error was introduced in 7d08d84
    (`dockerd-rootless.sh: set rootlesskit --state-dir=DIR`) that changed
    the filesystem of the state dir from /tmp to /run (in a typical setup).
    
    Fix issue 47248
    
    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    (cherry picked from commit 762ec4b)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    AkihiroSuda authored and vvoland committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    7ed7e6c View commit details
    Browse the repository at this point in the history
  4. daemon: move getUnprivilegedMountFlags to internal package

    This code is currently only used in the daemon, but is also needed in other
    places. We should consider moving this code to github.com/moby/sys, so that
    BuildKit can also use the same implementation instead of maintaining a fork;
    moving it to internal allows us to reuse this code inside the repository, but
    does not allow external consumers to depend on it (which we don't want as
    it's not a permanent location).
    
    As our code only uses this in linux files, I did not add a stub for other
    platforms (but we may decide to do that in the moby/sys repository).
    
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    (cherry picked from commit 7b414f5)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    thaJeztah authored and vvoland committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    4be9723 View commit details
    Browse the repository at this point in the history
  5. Environment variable to override resolv.conf path.

    If env var DOCKER_TEST_RESOLV_CONF_PATH is set, treat it as an override
    for the 'resolv.conf' path.
    
    Added as part of resolv.conf refactoring, but needed by back-ported test
    TestInternalNetworkDNS.
    
    Signed-off-by: Rob Murray <rob.murray@docker.com>
    robmry committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    20c205f View commit details
    Browse the repository at this point in the history
  6. libnet: Don't forward to upstream resolvers on internal nw

    Commit cbc2a71 makes `connect` syscall fail fast when a container is
    only attached to an internal network. Thanks to that, if such a
    container tries to resolve an "external" domain, the embedded resolver
    returns an error immediately instead of waiting for a timeout.
    
    This commit makes sure the embedded resolver doesn't even try to forward
    to upstream servers.
    
    Co-authored-by: Albin Kerouanton <albinker@gmail.com>
    Signed-off-by: Rob Murray <rob.murray@docker.com>
    (cherry picked from commit 790c303)
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    akerouanton authored and robmry committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    a987bc5 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #47586 from vvoland/v25.0-47569

    [25.0 backport] Makefile: generate-files: fix check for empty TMP_OUT
    thaJeztah authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    9df9ccc View commit details
    Browse the repository at this point in the history
  8. Merge pull request #47587 from vvoland/v25.0-47559

    [25.0 backport] rootless: fix `open /etc/docker/plugins: permission denied`
    neersighted authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    2a0601e View commit details
    Browse the repository at this point in the history
  9. Merge pull request #47588 from vvoland/v25.0-47558

    [25.0 backport] plugin: fix mounting /etc/hosts when running in UserNS
    vvoland authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    817bccb View commit details
    Browse the repository at this point in the history
  10. Merge pull request #47589 from vvoland/v25.0-47538

    [25.0 backport] libnet: Don't forward to upstream resolvers on internal nw
    vvoland authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e63daec View commit details
    Browse the repository at this point in the history
Loading