tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,811 Commits 23 Branches 268 Tags
Commit Graph

918 Commits

Author SHA1 Message Date
Cody Rigney
44337d2bbf Enhance JSON progress events with more fields. 
Signed-off-by: Cody Rigney <cody.rigney@docker.com>
 2024-07-23 16:20:27 +02:00
Suleiman Dibirov
4f9db4d3e6 fix(containers): fix sorting logic by adding secondary sorting for one-off containers 
Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
 2024-07-22 09:32:59 +02:00
Guillaume Lours
46679150d6 bump compose-go to v2.1.4, buildx to v0.16.0, containerd to v1.7.19 and buildx to v0.15.0 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-07-17 13:01:51 +02:00
Nicolas De Loof
d3d378b92a restore setEnvWithDotEnv 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-07-11 10:25:04 +02:00
Nicolas De Loof
163cdfd31d empty env variable with no value must be unset in container 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-07-10 14:23:34 +02:00
Nicolas De Loof
25f85938bb exclude unnecessary resources after services have been selected 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-07-09 15:12:27 +02:00
Suleiman Dibirov
9549a213ba feat(watch): Add --prune option to docker-compose watch command 
Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
 2024-07-02 08:16:09 +02:00
Joana Hrotko
da434013e3 Remove COMPOSE_MENU env from e2e tests 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-07-01 16:31:12 +01:00
Felix Fontein
06545d0668 Add JSON stream progress writer 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2024-07-01 15:32:51 +02:00
Paweł Gronowski
f79c28168b Remove console.Terminal check and use IsTerminal from streams.Out 
docker/cli v27 changed the return value of `Err()` to `streams.Out`
which made the typecheck for `console.File` fail.

The check is no longer needed due to the `IsTerminal` method present in
`streams.Out` which also has a special handling for Windows console.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2024-06-24 14:58:19 +02:00
Albin Kerouanton
6a000dcff1 go.mod: github.com/compose-spec/compose-go v2.1.3 
full diff:

- https://github.com/compose-spec/compose-go/compare/v2.1.2...v2.1.3

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-21 14:04:40 +02:00
Albin Kerouanton
2636dcf064 go.mod: docker/docker and docker/cli v27.0.1-rc.1 
diffs:

- https://github.com/docker/cli/compare/v26.1.4..v27.0.1-rc.1
- https://github.com/docker/docker/compare/v26.1.4..v27.0.1-rc.1

Co-authored-by: Albin Kerouanton <albinker@gmail.com
Signed-off-by: Albin Kerouanton <albinker@gmail.com
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-21 14:04:40 +02:00
Guillaume Lours
e1fd7a6567 using as flag of the up command, watch was blocking process shutdown 
This happened when sunsetting the application from docker compose down command

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-06-20 10:50:01 +02:00
Guillaume Lours
54a5e7d4aa stop watch process when associated up process is stopped 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-06-17 22:59:09 +02:00
Sebastiaan van Stijn
5ec37d08a5 build: replace uses of archive.CanonicalTarNameForPath 
This function is an alias for filepath.IsAbs and we are considering deprecating
and/or removing this function in the archive package, so removing its uses
helps transitioning if we decide to deprecate and/or remove it.

[docker/cli@fb0788f] also added a normalize step in TrimBuildFilesFromExcludes,
so that callers are not _required_ to first normalize the path, so the
normalizeation may be redunant, but keeping the normalization as this variable
is used further down the code.

[docker/cli@fb0788f]: fb0788f18f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-17 12:00:24 +02:00
Nicolas De Loof
084a5ca312 enforce keyboard.Close is always executed to restore terminal 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-06-11 07:20:37 +02:00
Alex Bedo
cc09f39f29 Readd event 
Signed-off-by: Alex Bedo <alex98hun@gmail.com>
 2024-06-10 12:06:30 +02:00
Alex Bedo
918b508bd5 remove unreachable code 
if statement is preceded by another that has the same condition and ends with a return

Signed-off-by: Alex Bedo <alex98hun@gmail.com>
 2024-06-10 12:06:30 +02:00
Nicolas De Loof
10531f6302 Fix dot env file to define COMPOSE_* variables 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-06-08 14:55:36 +02:00
Casey Korver
02f40eea67 Correct 'cancellation' typo in comment 
Signed-off-by: Casey Korver <casey@korver.dev>
 2024-06-05 09:22:59 +02:00
IDOMATH
250c3112b9 Fix: change append to use slice index in ps.go 
Signed-off-by: Blane Tschida <btdothemath@gmail.com>
 2024-05-30 16:16:01 +02:00
Nicolas De Loof
495a087fb5 COMPOSE_PROFILES can be set by .env file 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-30 07:40:01 +02:00
Nicolas De Loof
fd1f73a5e7 prevent concurrent map write relying on project immutability 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-29 11:29:18 +02:00
Guillaume Lours
2ed40e8042 add gui/composeview as part of available commands 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-05-23 19:19:59 +02:00
Rob Murray
048fd136d2 Set endpoint-specific DriverOpts 
Signed-off-by: Rob Murray <rob.murray@docker.com>
 2024-05-22 12:39:20 +02:00
Kirill A. Korinsky
fb25e88a03 Backport OpenBSD patches 
Here a trivial patch whcih I've used inside OpenBSD port to build it

Signed-off-by: Kirill A. Korinsky <kirill@korins.ky>
 2024-05-22 11:35:37 +02:00
Guillaume Lours
3635303372 add new navigation menu to open Compose app configuration in Docker Desktop 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-05-22 11:34:10 +02:00
Nicolas De Loof
5c6924ec6f fix --resolve-image-digests 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-22 10:54:55 +02:00
Nicolas De Loof
9e8c8caa2b allow a local .env file to override compose.yaml sibling .env 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-21 16:01:29 +02:00
Guillaume Lours
da8189cf22 Bump docker engine and cli to version 26.1.3 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2024-05-17 13:18:14 +02:00
Joana H
9c0b922597
fix: overlapping logs and menu navigation (#11765) 2024-04-24 14:59:42 -04: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
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
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
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
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 a4ddbcb6b2caf12826926d164d47319ac01fa6d4.

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
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
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
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