tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,829 Commits 20 Branches 259 Tags 62 MiB
Commit Graph

4829 Commits

Author SHA1 Message Date
Guillaume Lours 3c25af4fe9
Merge pull request #11405 from ndeloof/issue_11392 
Fix load .env from project directory when project file is set by COMPOSE_FILE
 2024-01-31 10:52:28 +01:00
Milas Bowman 8fdd45cd4c
chore(e2e): fix flaky test & standalone behavior (#11382) 2024-01-30 10:49:53 -05:00
CrazyMax a0954dc59d
ci(deps): replace buildkit to fix fsutil issues on Windows (#11426) 2024-01-30 10:48:48 -05:00
jhrotko 0582001810 Fix canonical container name 
Signed-off-by: jhrotko <joana.hrotko@docker.com>
 2024-01-30 15:12:22 +01:00
Guillaume Lours ac8ea082a1
Merge pull request #11409 from ndeloof/swarm_overlay_network 
don't check external network existence when swarm is enabled
 2024-01-29 20:11:13 +01:00
Nicolas De Loof da1a34a8f2 don't check external network existence when swarm is enabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-29 20:00:29 +01:00
Guillaume Lours cdb6eb55d5
Merge pull request #11406 from docker/dependabot/go_modules/github.com/docker/cli-25.0.1incompatible 
build(deps): bump github.com/docker/cli from 25.0.0+incompatible to 25.0.1+incompatible
 2024-01-29 19:56:56 +01:00
dependabot[bot] 8b023ae07d build(deps): bump github.com/docker/cli 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 25.0.0+incompatible to 25.0.1+incompatible.
- [Commits](https://github.com/docker/cli/compare/v25.0.0...v25.0.1)

---
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>
 2024-01-29 19:46:03 +01:00
Guillaume Lours e08140babe
Merge pull request #11407 from docker/dependabot/go_modules/github.com/docker/docker-25.0.1incompatible 
build(deps): bump github.com/docker/docker from 25.0.0+incompatible to 25.0.1+incompatible
 2024-01-29 19:44:44 +01:00
dependabot[bot] 8c80297c76 build(deps): bump github.com/docker/docker 
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.0+incompatible to 25.0.1+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v25.0.0...v25.0.1)

---
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>
 2024-01-29 19:33:58 +01:00
Guillaume Lours 05f1472f6a
Merge pull request #11422 from ndeloof/storage_opts 
Add support for storage_opt
 2024-01-29 19:33:22 +01:00
Guillaume Lours 5728c43db8
Merge pull request #11410 from thaJeztah/bump_engine_25.0.1 
ci(deps): update DOCKER_CLI_VERSION to v25.0.1
 2024-01-29 19:31:45 +01:00
Nicolas De Loof 7e991515bc Add support for storage_opt 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-29 19:24:23 +01:00
Sebastiaan van Stijn d979115692 ci(deps): update DOCKER_CLI_VERSION to v25.0.1 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-29 19:23:26 +01:00
Guillaume Lours c653ddf439
Merge pull request #11411 from laurazard/update-maintainers 
Update MAINTAINERS file
 2024-01-29 19:22:49 +01:00
Guillaume Lours a9cbb0f481
Merge pull request #11416 from glours/fix-merge-compose-go-issue 
bump compose-go to fix multiple compose files merge issues
 2024-01-29 15:41:24 +01:00
Guillaume Lours 71bebc16ee
bump compose-go to v2.0.0-rc.3 which fixes multiple compose files merge issues 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-01-29 15:26:26 +01:00
Guillaume Lours b0dc374abc
Merge pull request #11415 from dvdksn/bump-artifact-upload-v4 
build(deps): bump actions/upload-artifact from v3 to v4
 2024-01-26 09:49:48 +01:00
David Karlsson 25d16d1fb4 build(deps): bump actions/upload-artifact from v3 to v4 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2024-01-26 09:39:24 +01:00
Laura Brehm ab97dcc7c5
update MAINTAINERS file 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2024-01-25 14:28:44 +00:00
Nicolas De Loof a8bd3b7af1
Fix load .env from project directory when project file is set by COMPOSE_FILE 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-25 09:26:22 +01:00
Guillaume Lours bef8785fc2
Merge pull request #11400 from glours/fix-fsutils-windows 
use a custom version of fsutils that fixes a bug on Windows causing all Compose builds to fail
 2024-01-24 18:39:58 +01:00
Guillaume Lours 811364b4f8
use a custom version of fsutils that fixes a bug on Windows causing all Compose builds to fail 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-01-24 17:59:13 +01:00
Nicolas De Loof 1551fcb4e6 introduce stopAndRemoveContainer to share logic scaling down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-23 14:16:13 +01:00
Guillaume Lours 143ac0f1b6
Merge pull request #11390 from ndeloof/compose-go-v2.0.0-rc.2 
bump compose-go to v2.0.0-rc.2
 2024-01-22 17:07:26 +01:00
Nicolas De Loof eb4249ece4
bump compose-go to v2.0.0-rc.2 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-22 12:27:38 +01:00
Milas Bowman 1e8241f67c
ci(deps): upgrade to Moby v25.0.0 GA (#11381) 
https://github.com/moby/moby/releases/tag/v25.0.0
 2024-01-19 12:33:21 -05:00
Sebastiaan van Stijn 388169011f
Merge pull request #11359 from dvdksn/docs-update-cli-reference-link 
docs: update link to use canonical URL for command
 2024-01-19 12:52:12 +01:00
David Karlsson 053a560466 docs: update link to use canonical URL for command 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2024-01-19 11:38:14 +01:00
Laura Brehm 35e262e778
Merge pull request #11372 from thaJeztah/bump_engine_deps 2024-01-18 17:43:24 +00:00
Sebastiaan van Stijn 34ba0bc9dd
go.mod: github.com/moby/sys/mountinfo v0.7.1 
full diff: https://github.com/moby/sys/compare/mountinfo/v0.6.2...mountinfo/v0.7.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-18 17:59:21 +01:00
Sebastiaan van Stijn 56e38260ea
go.mod: github.com/google/uuid v1.5.0 
full diff: https://github.com/google/uuid/compare/v1.3.1...v1.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-18 17:58:39 +01:00
Guillaume Lours 83e020734d
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
 2024-01-18 10:47:24 +01:00
Guillaume Lours c28bf5227a bump version of compose-go to v2.0.0-rc.1 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-01-18 10:34:22 +01:00
Guillaume Lours 326ee2ad69
Merge pull request #11367 from docker/dependabot/go_modules/github.com/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
 2024-01-18 10:33:58 +01:00
dependabot[bot] 51c113b623 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](https://github.com/docker/docker/compare/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>
 2024-01-18 10:23:59 +01:00
Guillaume Lours 194b8af242
Merge pull request #11365 from docker/dependabot/go_modules/github.com/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
 2024-01-18 10:23:45 +01:00
Guillaume Lours 0d895a23f8
Merge pull request #11363 from glours/remove-watch-from-alpha 
remove watch subcommand from the alpha command
 2024-01-18 10:23:08 +01:00
Guillaume Lours 7cdc7e15e3 remove watch command from the alpha command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-01-18 10:14:43 +01:00
Guillaume Lours fb6d92250c
Merge pull request #11361 from laurazard/always-handle-signals 
signals/utils: always handle received signals
 2024-01-18 10:14:27 +01:00
dependabot[bot] fb026543f2
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](https://github.com/docker/cli/compare/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>
 2024-01-18 09:05:40 +00:00
Milas Bowman d688d3bf22 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>
 2024-01-17 21:17:16 +01:00
Laura Brehm 898e1b605d
signals/utils: always handle received signals 
The changes in
dcbf005fe4
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: https://github.com/moby/moby/issues/47073) so we reverted the
process group id changes and ended at a temporary solution in
https://github.com/docker/cli/pull/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>
 2024-01-17 17:18:20 +00:00
Nicolas De Loof f414bf7892 fix engine version require to use healthcheck.start_interval 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-17 10:45:01 +01:00
Nicolas De Loof 3c4593f2ad Stop the resource timer after last expected event 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-16 22:18:42 +01:00
dependabot[bot] d2562029f6
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>
 2024-01-16 15:13:12 -05:00
dependabot[bot] 26ed1051eb
build(deps): bump github.com/docker/docker from 25.0.0-rc.1+incompatible to 25.0.0-rc.2+incompatible (#11349) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-01-16 15:12:57 -05:00
dependabot[bot] 191c10b9d0
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>
 2024-01-16 15:12:35 -05:00
Guillaume Lours 8b16ab1040
Merge pull request #11307 from glours/compose-go-immutable-projects 
update compose-go to version using immutable Project functions
 2024-01-11 14:11:12 +01:00
Guillaume Lours 24d34040e3
Merge pull request #11181 from g0t4/11153-compose-attach-override-container-attach-cmd 
Implement `docker compose attach`
 2024-01-11 11:11:10 +01:00