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: docker/compose
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.24.0
Choose a base ref
...
head repository: docker/compose
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.24.1
Choose a head ref
  • 16 commits
  • 17 files changed
  • 5 contributors

Commits on Jan 16, 2024

  1. build(deps): bump github.com/docker/cli from 25.0.0-rc.1+incompatible…

    … to 25.0.0-rc.2+incompatible (#11348)
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    191c10b View commit details
    Browse the repository at this point in the history
  2. build(deps): bump github.com/docker/docker from 25.0.0-rc.1+incompati…

    …ble to 25.0.0-rc.2+incompatible (#11349)
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    26ed105 View commit details
    Browse the repository at this point in the history
  3. build(deps): bump github.com/containerd/containerd from 1.7.11 to 1.7…

    ….12 (#11347)
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    d256202 View commit details
    Browse the repository at this point in the history
  4. Stop the resource timer after last expected event

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    ndeloof committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    3c4593f View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. fix engine version require to use healthcheck.start_interval

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    ndeloof committed Jan 17, 2024
    3 Configuration menu
    Copy the full SHA
    f414bf7 View commit details
    Browse the repository at this point in the history
  2. signals/utils: always handle received signals

    The changes in
    dcbf005
    fixed the "cancellable context" detection, and made it so that Compose
    would conditionally set up signal handling when the context was already
    not cancellable/when the plugin was running through the CLI, as we'd
    introduced a mechanism into the CLI to signal plugins to exit through a
    socket instead of handling signals themselves.
    
    This had some (not noticed at the time) issues when running through the
    CLI as, due to sharing a process group id with the parent CLI process,
    when a user CTRL-Cs the CLI will notify the plugin via the socket but
    the plugin process itself will also be signalled if attached to the TTY.
    This impacted some Compose commands that don't set up signal handling -
    so not `compose up`, but other commands would immediately quit instead
    of getting some "graceful" cancelled output.
    
    We initially attempted to address this "double notification" issue in
    the CLI by executing plugins under a new pgid so that they wouldn't be
    signalled, but that posed an issue with Buildx reading from the TTY,
    (see: moby/moby#47073) so we reverted the
    process group id changes and ended at a temporary solution in
    docker/cli#4792 where the CLI will only notify
    plugins via the socket when they are not already going to be signalled
    (when attached to a TTY).
    
    Due to this, plugins should always set up some signal handling, which
    this commit implements.
    
    Signed-off-by: Laura Brehm <laurabrehm@hey.com>
    laurazard committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    898e1b6 View commit details
    Browse the repository at this point in the history
  3. fix(tracing): batch span exports to prevent blocking

    This was a bad configuration (my fault) that meant each span was
    exported synchronously, as it ended. That can cause weird behavior
    such as stuttering/blocking.
    
    There's really no reason to NOT use the batch processor, it's the
    recommended way to configure it. In the future, it might make sense
    to tune the intervals based on the fact that Compose is a CLI vs
    a long-running server app, but we handle flushing out on exit
    already, so it's not a huge deal.
    
    Signed-off-by: Milas Bowman <milas.bowman@docker.com>
    milas authored and ndeloof committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d688d3b View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. build(deps): bump github.com/docker/cli

    Bumps [github.com/docker/cli](https://github.com/docker/cli) from 25.0.0-rc.2+incompatible to 25.0.0-rc.3+incompatible.
    - [Commits](docker/cli@v25.0.0-rc.2...v25.0.0-rc.3)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/docker/cli
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fb02654 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11361 from laurazard/always-handle-signals

    signals/utils: always handle received signals
    glours authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fb6d922 View commit details
    Browse the repository at this point in the history
  3. remove watch command from the alpha command

    Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
    glours committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    7cdc7e1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11363 from glours/remove-watch-from-alpha

    remove watch subcommand from the alpha command
    glours authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0d895a2 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #11365 from docker/dependabot/go_modules/github.co…

    …m/docker/cli-25.0.0-rc.3incompatible
    
    build(deps): bump github.com/docker/cli from 25.0.0-rc.2+incompatible to 25.0.0-rc.3+incompatible
    glours authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    194b8af View commit details
    Browse the repository at this point in the history
  6. build(deps): bump github.com/docker/docker

    Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.0-rc.2+incompatible to 25.0.0-rc.3+incompatible.
    - [Release notes](https://github.com/docker/docker/releases)
    - [Commits](moby/moby@v25.0.0-rc.2...v25.0.0-rc.3)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/docker/docker
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and glours committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    51c113b View commit details
    Browse the repository at this point in the history
  7. Merge pull request #11367 from docker/dependabot/go_modules/github.co…

    …m/docker/docker-25.0.0-rc.3incompatible
    
    build(deps): bump github.com/docker/docker from 25.0.0-rc.2+incompatible to 25.0.0-rc.3+incompatible
    glours authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    326ee2a View commit details
    Browse the repository at this point in the history
  8. bump version of compose-go to v2.0.0-rc.1

    Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
    glours committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c28bf52 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #11368 from glours/bump-compose-go-v2.0.0-rc.1

    bump version of compose-go to v2.0.0-rc.1
    glours authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    83e0207 View commit details
    Browse the repository at this point in the history
Loading