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: 511cd1c0a736
Choose a base ref
...
head repository: moby/moby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 250792c1a540
Choose a head ref
  • 17 commits
  • 8 files changed
  • 4 contributors

Commits on Apr 10, 2025

  1. integration-cli: Update default CLI version to v18.06.3-ce 

    This updates the Docker CLI version used for integration-cli tests from
v17.06.2-ce to v18.06.3-ce.

v18.06 is the first one that supports enabling BuildKit.

Signed-off-by: Paweł Gronowski <[email protected]>
    @vvoland
    vvoland committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    fab9480 View commit details
    Browse the repository at this point in the history

  2. integration-cli/TestSwarmInit: Skip failing part on CLI after 18.06 

    Signed-off-by: Paweł Gronowski <[email protected]>
    @vvoland
    vvoland committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    ea6c76e View commit details
    Browse the repository at this point in the history

  3. integration-cli/swarm: Update to use gotest.tools 

    Signed-off-by: Paweł Gronowski <[email protected]>
    @vvoland
    vvoland committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    5f9d99b View commit details
    Browse the repository at this point in the history

  4. API: /info: remove BridgeNfIptables, BridgeNfIp6tables fields 

    The `BridgeNfIptables` and `BridgeNfIp6tables` fields in the
`GET /info` response were deprecated in API v1.48, and are now omitted
in API v1.49.

With this patch, old API version continue to return the field:

    curl -s --unix-socket /var/run/docker.sock http://localhost/v1.48/info | jq .BridgeNfIp6tables
    false

    curl -s --unix-socket /var/run/docker.sock http://localhost/v1.48/info | jq .BridgeNfIptables
    false

Omitting the field in API v1.49 and above

    curl -s --unix-socket /var/run/docker.sock http://localhost/v1.49/info | jq .BridgeNfIp6tables
    null

    curl -s --unix-socket /var/run/docker.sock http://localhost/v1.49/info | jq .BridgeNfIptables
    null

Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    5d20062 View commit details
    Browse the repository at this point in the history

  5. Dockerfile: update registry to v3.0.0 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    f96dc9d View commit details
    Browse the repository at this point in the history

  6. daemon: trace containerCreate 

    This commit adds a new OTel span to `(*Daemon).containerCreate()` and
puts filtered container labels in the span attributes.

The filter is based on a comma-separated list of labels provided through
the `DOCKER_OTEL_INCLUDE_CONTAINER_LABEL_ATTRS` environment variable.
This label might be removed at any point in time if we figure out a
better way to filter labels, or if that span becomes unecessary.

Signed-off-by: Albin Kerouanton <[email protected]>
    @akerouanton
    akerouanton committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    0c5e816 View commit details
    Browse the repository at this point in the history

  7. daemon: containerStart: add filtered labels to OTel span 

    Like for containerCreate, filter the list of container labels based on
`DOCKER_OTEL_INCLUDE_CONTAINER_LABEL_ATTRS` and put that list in the
OTel span.

Signed-off-by: Albin Kerouanton <[email protected]>
    @akerouanton
    akerouanton committed Apr 10, 2025
    Configuration menu
    Copy the full SHA
    099d3ee View commit details
    Browse the repository at this point in the history

  8. Merge pull request #49787 from thaJeztah/bump_registry 

    Dockerfile: update registry to v3.0.0
    @thaJeztah
    thaJeztah authored Apr 10, 2025
    Configuration menu
    Copy the full SHA
    a6928fd View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2025

  1. Merge pull request #49677 from vvoland/integration-cli-bump-cli 

    integration-cli: Update default CLI version to v18.06.3-ce
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    fb2983a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49789 from akerouanton/trace-containerCreate-labels 

    daemon: containerCreate, containerStart: add filtered labels to OTel span
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    cdad178 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #49783 from thaJeztah/deprecate_bridgenfip_fields 

    API: /info: remove BridgeNfIptables, BridgeNfIp6tables fields
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    f3d6830 View commit details
    Browse the repository at this point in the history

  4. docs/api: add documentation for API v1.49 

    Copy the swagger / OpenAPI file to the documentation. This is the API
version used by the upcoming v28.1.0 release.

Signed-off-by: Paweł Gronowski <[email protected]>
    @vvoland
    vvoland committed Apr 11, 2025
    Configuration menu
    Copy the full SHA
    adb9e91 View commit details
    Browse the repository at this point in the history

  5. Update AUTHORS 

    Signed-off-by: Paweł Gronowski <[email protected]>
    @vvoland
    vvoland committed Apr 11, 2025
    Configuration menu
    Copy the full SHA
    ece7e02 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #49794 from vvoland/update-authors 

    Update AUTHORS
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    36f8775 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #49793 from vvoland/cut-api 

    docs/api: add documentation for API v1.49
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    73520a5 View commit details
    Browse the repository at this point in the history

  8. Revert "API: /info: remove BridgeNfIptables, BridgeNfIp6tables fields" 

    This reverts commit 5d20062, which
caused some issues in the docker/cli formatting code that needs some
investigating.

Let's (temporarily) revert this while we look what's wrong.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 11, 2025
    Configuration menu
    Copy the full SHA
    eacbbde View commit details
    Browse the repository at this point in the history

  9. Merge pull request #49795 from thaJeztah/revert_info_changes 

    Revert "API: /info: remove BridgeNfIptables, BridgeNfIp6tables fields"
    @vvoland
    vvoland authored Apr 11, 2025
    Configuration menu
    Copy the full SHA
    250792c View commit details
    Browse the repository at this point in the history
Loading