tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,744 Commits 24 Branches 262 Tags 66 MiB
Commit Graph

4744 Commits

Author SHA1 Message Date
Guillaume Lours eb5e018698
Merge pull request #11811 from ndeloof/bump_docker_v26.1.2 
Bump docker to v26.1.2
 2024-05-13 11:51:30 +02:00
Nicolas De Loof e64b96d0fa
Bump docker to v26.1.2 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-13 08:54:56 +02:00
Joana Hrotko b81624185f Add documentation for --menu up option and COMPOSE_MENU environemnt variable 
Co-authored-by: Milas Bowman <devnull@milas.dev>
Signed-off-by: Joana H <joana.hrotko@gmail.com>
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-05-07 15:37:32 +02:00
Nicolas De loof 591d9eb3a2
chore(deps): bump docker to v26.1.1 (#11794) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-06 09:16:01 -04:00
Joana H 9c0b922597
fix: overlapping logs and menu navigation (#11765) 2024-04-24 14:59:42 -04:00
Guillaume Lours c26d2fa7cf
Merge pull request #11762 from docker/dependabot/go_modules/github.com/moby/buildkit-0.13.1 
build(deps): bump github.com/moby/buildkit from 0.13.0-rc3.0.20240417151852-71f99c52a669 to 0.13.1
 2024-04-24 19:27:31 +02:00
dependabot[bot] cfb110653f build(deps): bump github.com/moby/buildkit 
Bumps [github.com/moby/buildkit](https://github.com/moby/buildkit) from 0.13.0-rc3.0.20240417151852-71f99c52a669 to 0.13.1.
- [Release notes](https://github.com/moby/buildkit/releases)
- [Commits](https://github.com/moby/buildkit/commits/v0.13.1)

---
updated-dependencies:
- dependency-name: github.com/moby/buildkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-24 17:32:50 +02:00
Guillaume Lours b53b8b24f1
Merge pull request #11739 from milas/fix-e2e-cascade-flaky 
chore(e2e): fix flaky cascade failure test
 2024-04-24 16:29:51 +02:00
Milas Bowman 36bf0c458b chore(e2e): fix flaky cascade failure test 
This was racy with the sleep, so the Compose file has been
tweaked to make it pass reliably.

Now, there's 3 services:
 * `running` - sleeps forever
 * `exit` - exits _successfully_ immediately
   * depends on `running` started
 * `fail` - exits _with error_ immediately
   * depends on `exit` succeeding

Now, the test can ensure that the containers are all run/
started in the expected order the assertions will be reliable.

Before, it was possible for `fail` to run & exit before `exit`,
for example. The `running` service also ensures there's always
at least one other "running" container when we do an abort.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2024-04-24 11:03:27 +02:00
Guillaume Lours 299fcd57fd use v2.26.1 tag for moby and Docker cli 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-04-24 10:57:11 +02:00
Milas Bowman b90cb48a1d chore(deps): update to Moby v26.1 & buildx v0.14 
* `moby/buildkit` commit comes from `docker/buildx`
* v26.1-dev from `moby/moby` & `docker/cli`

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2024-04-24 10:57:11 +02:00
Guillaume Lours f8808d81c5 bump compose-go version to v2.1.0 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-04-23 10:35:16 +02:00
Guillaume Lours 2c9c60e007
Merge pull request #11752 from ndeloof/flag_equal 
fix support for `--flag=value` syntax in compatibility mode
 2024-04-22 10:52:59 +02:00
Nicolas De Loof 9970a84ae6
fix support for --context=foo 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-22 10:42:34 +02:00
Jaime Soriano Pastor 5682480726
Fix #11710: Avoid to try to close channel twice after hitting Ctrl-C on compose up (#11719) 
Ensure done channel is closed only once

Signed-off-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
 2024-04-20 06:09:26 +00:00
Milas Bowman fd532a37e7
fix(desktop): remove overly-aggressive feature flag check (#11748) 2024-04-19 16:06:57 -04:00
racequite 2aa568ceba chore: fix typo in comment 
Signed-off-by: racequite <quiterace@gmail.com>
 2024-04-19 09:54:08 +02:00
Nicolas De Loof 4ae2e0ec55 bump dependencies 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-18 10:58:56 +02:00
Milas Bowman 922422a539 fix: do not try to create file shares for non-directories 
When creating automatic file shares, ignore any non-directory
bind mounts, e.g. for an individual (normal) file or a special
type like a Unix socket (`/var/run/docker.sock`).

Additionally, there's no need to create a directory if one
does not exist, the API will handle that. However, the check
for existence remains so that `create_host_path: false`
mounts can be ignored.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2024-04-17 17:12:03 +02:00
Nicolas De Loof d239f0f318 check container_name is not in use by another service we will create 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-16 17:26:50 +02:00
Nicolas De Loof ca734ce565 don't clear line when navigation is disabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-16 16:04:23 +02:00
Nicolas De loof c9e070f0f6
fix: return correct exit code with `--exit-code-from` (#11715) 2024-04-16 09:44:23 -04:00
Nicolas De Loof b3792dd258 progress for resource can be restarted after more Working event comes 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-15 22:05:46 +02:00
Nicolas De Loof d8ee474e09 Revert "Stop the resource timer after last expected event" 
This reverts commit a4ddbcb6b2.

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-15 22:05:46 +02:00
Jaime Soriano Pastor 7d3616474d Revert change to allow trying to kill again if a kill fails 
Signed-off-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
 2024-04-14 17:44:39 +02:00
Jaime Soriano Pastor 6a3501f901 Handle errors and allow to send multiple kills if one failed 
Signed-off-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
 2024-04-14 17:44:39 +02:00
Jaime Soriano Pastor 5daed33c6a Ignore errors when killing on second Ctrl-C 
Signed-off-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
 2024-04-14 17:44:39 +02:00
Jaime Soriano Pastor 5c1e5f3fc7 docker compose up always kills the containers on second Ctrl-C 
Kill executed on the second Ctrl-C of docker compose up  was
filtering containers depending on its state. In some cases the
containers can reach an state for what these filters don't get
any container, and the command keeps reporting `no container to
kill`.

Remove this filtering, so it tries to kill any container it
finds, independently of its state.

Fixes https://github.com/docker/compose/issues/10661

Signed-off-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
 2024-04-14 17:44:39 +02:00
Nicolas De Loof b032999f06 read COMPOSE_REMOVE_ORPHANS from .env 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-11 16:24:15 +02:00
koooge 5059a1d7bf Set Required false to depends_on containers for compose -p stop/down 
Signed-off-by: koooge <koooooge@gmail.com>
 2024-04-11 10:48:09 +02:00
koooge 54a525bbe6 Ignore missing containers when compose stop -p 
Signed-off-by: koooge <koooooge@gmail.com>
 2024-04-11 10:48:09 +02:00
koooge 8ceaf49296 Ignore missing containers when compose down -p 
Signed-off-by: koooge <koooooge@gmail.com>
 2024-04-11 10:48:09 +02:00
Guillaume Lours bfee07e1eb
Merge pull request #11708 from ndeloof/entitlements 
Introduce support for build.entitlements
 2024-04-10 14:16:30 +02:00
Nicolas De Loof 1d32592056
Introduce support for build.entitlements 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-10 12:27:49 +02:00
Delath 85567ae092 Remove dead url reference. 
Signed-off-by: Delath <62723360+delath@users.noreply.github.com>
 2024-04-09 17:50:24 +02:00
Nicolas De Loof b4280fb561 e2e test for --all-resources 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-09 15:30:42 +02:00
Nicolas De Loof 865a64afea introduce --all-resources to _not_ exclude resources not used by services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-09 15:30:42 +02:00
Nicolas De Loof 29692b5921 Introduce --abort-on-container-failure 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-08 15:40:54 +02:00
Guillaume Lours 2658c372a7 bump golang version to 1.21.9 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-04-04 13:36:48 +02:00
Nicolas De Loof d71d8bce24 don't use ansi espace sequence when disabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-04-03 15:43:16 +02:00
Joana Hrotko ff20b641c7 Does not start keyboard manager if there is no tty 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-03-28 17:57:26 +00:00
Joana Hrotko 339b331a86 Change menu information text to dim 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-03-28 12:18:00 +00:00
Guillaume Lours 6fe69b2575
Merge pull request #11664 from jhrotko/fix-no-build-watch 
Handle --no-build and --watch args
 2024-03-27 11:37:38 +01:00
Joana Hrotko dd5614ec3b Handle --no-build and --watch args 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-03-26 18:22:26 +00:00
dependabot[bot] 4b7b6adc76 build(deps): bump github.com/opencontainers/image-spec 
Bumps [github.com/opencontainers/image-spec](https://github.com/opencontainers/image-spec) from 1.1.0-rc6 to 1.1.0.
- [Release notes](https://github.com/opencontainers/image-spec/releases)
- [Changelog](https://github.com/opencontainers/image-spec/blob/main/RELEASES.md)
- [Commits](https://github.com/opencontainers/image-spec/compare/v1.1.0-rc6...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/opencontainers/image-spec
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-26 15:24:39 +01:00
Felix Fontein 466374bdd0 Unwrap error message. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2024-03-25 07:37:34 +01:00
Felix Fontein 2e85b3c265 Include error message in pull warning/errors 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2024-03-25 07:37:34 +01:00
Milas Bowman 3371227794 chore(desktop): revised feature detection for file shares 
Unfortunately, the feature flag mechanism for experimental features
isn't adequate. To avoid some edge cases where Compose might try to
use Synchronized file shares with Desktop when the feature isn't
available, we need to query a new endpoint.

Before we move any of this out of experimental, we need to improve
the integration here with Desktop & Compose so that we get all the
necessary feature/experiment state up-front to reduce the quantity
of IPC calls needed up-front.

For now, there's some intentional redundancy to avoid making this
extra call if we can avoid it. The actual endpoint is very cheap/
fast, but every IPC call is a potential point of of failure, so
it's worth it.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2024-03-22 18:16:27 +01:00
Joana Hrotko e9dc82011f Add Navigation Menu to compose up 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-03-22 17:48:25 +01:00
Nicolas De Loof 3950460703 Add support for volume Subpath option 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-03-22 14:33:56 +01:00