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

Commits on Jun 27, 2024

  1. Dockerfile: update compose to v2.28.1

    Update the compose cli plugin used in the dev-container
    
    full diff: docker/cli@v2.27.1...v2.28.1
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    (cherry picked from commit 790035f)
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    e419e22 View commit details
    Browse the repository at this point in the history
  2. Dockerfile: update docker CLI to v27.0.2

    Update the Docker CLI used in the dev-container
    
    full diff: docker/cli@v26.1.0...v27.0.2
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    (cherry picked from commit 3928165)
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    838330b View commit details
    Browse the repository at this point in the history
  3. Merge pull request #48074 from vvoland/v27.0-48073

    [27.0 backport] Dockerfile: update compose to v2.28.1, update cli to v27.0.2
    thaJeztah authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b70040a View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. pkg/archive: getWhiteoutConverter: don't error with userns enabled

    Since 838047a, the overlayWhiteoutConverter
    is supported with userns enabled, so we no longer need this check.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit af85e47)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    02e2448 View commit details
    Browse the repository at this point in the history
  2. pkg/archive: handleTarTypeBlockCharFifo: don't discard EPERM errors

    This function was discarding EPERM errors if it detected that userns was
    enabled; move such checks to the caller-site, so that they can decide
    how to handle the error (which, in case of userns may be to log and ignore).
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 379ce56)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    c5794e2 View commit details
    Browse the repository at this point in the history
  3. pkg/archive: createTarFile: consistently use the same value for userns

    createTarFile accepts a opts (TarOptions) argument to specify whether
    userns is enabled; whe should consider always detecting locally, but
    at least make sure we're consistently working with the same value within
    this function.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 969993a)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b951474 View commit details
    Browse the repository at this point in the history
  4. daemon/graphdriver/overlay2: set TarOptions.InUserNS for native differ

    Commits b2fd67d (and the follow-up commit
    f6b8025) updated doesSupportNativeDiff to
    detect whether the host can support native overlay diffing with userns
    enabled.
    
    As a result, [useNaiveDiff] would now return "false" in cases where it
    previously would return "true" (and thus skip). However, [overlay2],
    unlike [fuse-overlay] did not take user namespaces into account, when
    using the native differ, and it therefore did not set the InUserNS option
    in TarOptions.
    
    As a result pkg/archive.createTarFile would attempt tocreate [device-nodes]
    through [handleTarTypeBlockCharFifo] which would fail, but the resulting
    error `EPERM` would be discarded, and `createTarFile` would not return
    early, therefor attempting to [os.LChown] the missing file, ultimately
    resulting in an error:
    
        failed to Lchown "/dev/console" for UID 0, GID 0: lchown /dev/console: no such file or directory
    
    This patch fixes the missing option in overlay.
    
    [useNaiveDiff]: https://github.com/moby/moby/blob/47eebd718f332f29a38455b61ee879ced5bc219b/daemon/graphdriver/overlay2/overlay.go#L248-L256
    [overlay2]: https://github.com/moby/moby/blob/47eebd718f332f29a38455b61ee879ced5bc219b/daemon/graphdriver/overlay2/overlay.go#L684-L689
    [fuse-overlay]: https://github.com/moby/moby/blob/47eebd718f332f29a38455b61ee879ced5bc219b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go#L456-L462
    [device-nodes]: https://github.com/moby/moby/blob/ff1e2c0de72a1bbbe4cdbe1558da57d327899df5/pkg/archive/archive.go#L713-L720
    [handleTarTypeBlockCharFifo]: https://github.com/moby/moby/blob/47eebd718f332f29a38455b61ee879ced5bc219b/pkg/archive/archive_unix.go#L110-L114
    [os.LChown]: https://github.com/moby/moby/blob/ff1e2c0de72a1bbbe4cdbe1558da57d327899df5/pkg/archive/archive.go#L762-L773
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 6521057)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f8231b5 View commit details
    Browse the repository at this point in the history
  5. fix some gofmt issues reported by goreportcard

    https://goreportcard.com/report/github.com/docker/docker
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 6ada1cf)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    bf222d6 View commit details
    Browse the repository at this point in the history
  6. Fix duplicate subnet allocations

    Keep allocated subnets in-order, so that they're not mistakenly
    reallocated due to a gap in the list where misplaced subnets should
    have been.
    
    Introduced in 9d288b5.
    
    The iterator over allocated subnets was incremented too early, this
    change moves it past three clauses in addrSpace.allocatePredefinedPool().
    The three new unit tests correspond to a separate failure caused by
    incrementing before each of them.
    
    (cherry picked from commit 4de54ee)
    Signed-off-by: Rob Murray <[email protected]>
    robmry committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    23b8b02 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #48089 from robmry/backport-27.0/48069_fix_overlap…

    …ping_subnets
    
    [27.0 backport] Fix duplicate subnet allocations
    thaJeztah authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    22aa07b View commit details
    Browse the repository at this point in the history
  8. Fix incorrect validation of port mapping

    Regression introduced in 01eecb6.
    
    A port mapping from a specific IPv6 host address can be used
    by a container on an IPv4-only network, docker-proxy makes the
    connection.
    
    Signed-off-by: Rob Murray <[email protected]>
    (cherry picked from commit dfbcddb)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    robmry authored and thaJeztah committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    276a648 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #48087 from thaJeztah/27.0_backport_gofmt

    [27.0 backport] fix some gofmt issues reported by goreportcard
    thaJeztah authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    0dbc3ac View commit details
    Browse the repository at this point in the history
  10. Merge pull request #48086 from thaJeztah/27.0_backport_fix_rootless_pull

    [27.0 backport] daemon/graphdriver/overlay2: set TarOptions.InUserNS for native differ (fix "failed to Lchown "/dev/console")
    thaJeztah authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b86d9bd View commit details
    Browse the repository at this point in the history
  11. Merge pull request #48090 from thaJeztah/27.0_backport_48067_fix_spec…

    …ific_ipv6_portmap_proxy_to_ipv4
    
    [27.0 backport] Fix incorrect validation of port mapping
    thaJeztah authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    662f78c View commit details
    Browse the repository at this point in the history
Loading