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: c04dec11437f
Choose a base ref
...
head repository: moby/moby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b45aa469cac7
Choose a head ref
  • 20 commits
  • 32 files changed
  • 5 contributors

Commits on May 13, 2025

  1. container: don't persist State.RemovalInProgress on disk

    State.RemovalInProgress was originally non-exported when it was added in
    [40945fc][1], adding a comment that the
    field should not be persisted to disk.
    
    But when moved to a separate package in [6bb0d18][2],
    it was was exported, without adding `json:"-"`. As a result, it's now persisted
    to disk;
    
        cat /var/lib/docker/containers/e493924a99cad918cda8048f967032729105ee072d563d734125cec46e1b5885/config.v2.json | jq .State
        {
          "Running": true,
          "Paused": false,
          "Restarting": false,
          "OOMKilled": false,
          "RemovalInProgress": false,
          "Dead": false,
          "Pid": 5053,
          "ExitCode": 0,
          "Error": "",
          "StartedAt": "2025-05-13T12:12:15.115512564Z",
          "FinishedAt": "0001-01-01T00:00:00Z",
          "Health": null
        }
    
    Note that this type is used internally, and (while similar) is not used for
    API responses;
    
        docker inspect e493924a99cad918cda8048f967032729105ee072d563d734125cec46e1b5885 | jq .[].State
        {
          "Status": "running",
          "Running": true,
          "Paused": false,
          "Restarting": false,
          "OOMKilled": false,
          "Dead": false,
          "Pid": 5053,
          "ExitCode": 0,
          "Error": "",
          "StartedAt": "2025-05-13T12:12:15.115512564Z",
          "FinishedAt": "0001-01-01T00:00:00Z"
        }
    
    However, interestingly, [`daemon.restore`][3] does take this field into account
    while restoring containers, which seems that it depends on the field being
    persisted to disk. That logic was added in [ce72473][4].
    That logic may be redundant if we no longer persist to disk, as the `State.Dead`
    is already set when cleaning up a container in [`daemon.cleanupContainer`][5].
    
    [1]: 40945fc
    [2]: 6bb0d18#diff-60173e67d15f3085dd09956b3ffa83566ae25fec61cfe08ddd2e1c37223e3be7R24
    [3]: https://github.com/moby/moby/blob/d42d79dceb68349795f9a0b6397fa955681fcc88/daemon/daemon.go#L498-L514
    [4]: ce72473
    [5]: https://github.com/moby/moby/blob/294f0c36e468dc097d56dcf88d4418b7dc3d2856/daemon/delete.go#L124-L126
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed May 13, 2025
    Configuration menu
    Copy the full SHA
    854f3f6 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2025

  1. Use containerd errdefs for error checks

    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 15, 2025
    Configuration menu
    Copy the full SHA
    f1bb44a View commit details
    Browse the repository at this point in the history
  2. Ignore deprecations for internal errdefs package

    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 15, 2025
    Configuration menu
    Copy the full SHA
    a90a9d8 View commit details
    Browse the repository at this point in the history
  3. Use standard library interface to unwrap errors

    The `Cause()` function is not part of the standard library and should
    not be used or relied on. `pkg/errors` already has compatibility with
    the standard library.
    
    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 15, 2025
    Configuration menu
    Copy the full SHA
    5c16f2d View commit details
    Browse the repository at this point in the history
  4. Update api status checks to use containerd/errdefs

    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 15, 2025
    Configuration menu
    Copy the full SHA
    fadb571 View commit details
    Browse the repository at this point in the history
  5. Cleanup http status error checks

    Use the errdefs resolver to ensure the status code is chosen from the
    first outermost error. Remove duplicate containerd errdefs checks.
    
    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 15, 2025
    Configuration menu
    Copy the full SHA
    23fa0ae View commit details
    Browse the repository at this point in the history

Commits on May 16, 2025

  1. client: deprecate IsErrNotFound

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed May 16, 2025
    Configuration menu
    Copy the full SHA
    7aa7369 View commit details
    Browse the repository at this point in the history
  2. api/types: move build cache types to api/types/build

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed May 16, 2025
    Configuration menu
    Copy the full SHA
    eefe68a View commit details
    Browse the repository at this point in the history
  3. Refactor CPU usage stats test to use go:embed

    Refactor the system CPU usage testing approach for improved maintainability:
    
    1. Extract the core CPU usage parsing logic into a new `readSystemCPUUsage`
       function that accepts an io.Reader, making it more testable and modular.
    
    2. Use go:embed directive to embed the test data file at compile time,
       eliminating runtime file operations and making tests more reliable.
    
    3. Simplify the test by removing global variable mocking in favor of a more
       direct approach with the new reader-based function.
    
    4. Maintain full test coverage for the long "intr" line edge case which was
       crucial for the original bug fix, while making the test more maintainable.
    
    This change preserves the original test behavior while improving code quality,
    testability, and making the tests self-contained.
    
    Signed-off-by: Lee Gaines <[email protected]>
    onprema committed May 16, 2025
    Configuration menu
    Copy the full SHA
    6d7a370 View commit details
    Browse the repository at this point in the history
  4. daemon: Fix error log when CDI cache creation failed

    Logger was created but no consumed.
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed May 16, 2025
    Configuration menu
    Copy the full SHA
    23bbfea View commit details
    Browse the repository at this point in the history
  5. testutil/daemon: Don't use devcontainers daemon.json

    Prevent the daemon spawned for integration tests from sourcing the
    daemon configuration intended interactive dev shell usage.
    
    Before this change, integration tests would fail to create a daemon
    with different configuration provided via cli flags (like `--feature`)
    if they're already specified in the default daemon.json.
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed May 16, 2025
    Configuration menu
    Copy the full SHA
    b70b496 View commit details
    Browse the repository at this point in the history
  6. api: bump API version to 1.50

    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed May 16, 2025
    Configuration menu
    Copy the full SHA
    f95a7c4 View commit details
    Browse the repository at this point in the history
  7. daemon: Discover devices and include in system info

    Add ability for the device driver to implement a device discovery
    mechanism and expose discovered devices in the `docker info` output.
    
    Currently it's only implemented for CDI devices.
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed May 16, 2025
    Configuration menu
    Copy the full SHA
    9095698 View commit details
    Browse the repository at this point in the history
  8. client/info_test: Use gotest.tools asserts

    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland committed May 16, 2025
    Configuration menu
    Copy the full SHA
    c1b2be0 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #50015 from thaJeztah/move_prune_options

    api/types: move build cache types to api/types/build
    vvoland authored May 16, 2025
    Configuration menu
    Copy the full SHA
    e190fdf View commit details
    Browse the repository at this point in the history
  10. Merge pull request #49980 from vvoland/devices-discovery

    daemon: Discover devices and include in system info
    vvoland authored May 16, 2025
    Configuration menu
    Copy the full SHA
    81116f7 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #47883 from dmcgowan/errdefs-check-containerd

    Update errdefs package to use containerd/errdefs
    thaJeztah authored May 16, 2025
    Configuration menu
    Copy the full SHA
    48733b0 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #50012 from thaJeztah/deprecate_client_iserrnotfound

    client: deprecate IsErrNotFound
    thaJeztah authored May 16, 2025
    Configuration menu
    Copy the full SHA
    2ff42e1 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #49968 from thaJeztah/dont_persist_removal_in_prog…

    …ress
    
    container: don't persist State.RemovalInProgress on disk
    thaJeztah authored May 16, 2025
    Configuration menu
    Copy the full SHA
    ede7368 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #49897 from scalewithlee/49768-docker-stats-follow-up

    Refactor CPU stats collection
    vvoland authored May 16, 2025
    Configuration menu
    Copy the full SHA
    b45aa46 View commit details
    Browse the repository at this point in the history
Loading