d658fecc63
service hash must exlude depends_on
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-08-26 16:05:15 +01:00
f9c7a0cc08
prefer mount API over bind
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-08-26 16:05:04 +01:00
9c03797f9d
initial sync files that modified after image creation
...
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
2024-08-09 12:11:16 +02:00
485c0eba53
initial sync for root directory
...
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
2024-08-09 12:11:16 +02:00
ea4ccf639d
Fix stop on file chane for sync-restart action
...
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
2024-07-25 16:28:47 +02:00
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
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
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
d3d378b92a
restore setEnvWithDotEnv
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-07-11 10:25:04 +02:00
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
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
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
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
06545d0668
Add JSON stream progress writer
...
Signed-off-by: Felix Fontein <felix@fontein.de>
2024-07-01 15:32:51 +02:00
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
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
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
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
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
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
2024-06-17 12:00:24 +02:00
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
cc09f39f29
Readd event
...
Signed-off-by: Alex Bedo <alex98hun@gmail.com>
2024-06-10 12:06:30 +02:00
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
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
02f40eea67
Correct 'cancellation' typo in comment
...
Signed-off-by: Casey Korver <casey@korver.dev>
2024-06-05 09:22:59 +02:00
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
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
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
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
048fd136d2
Set endpoint-specific DriverOpts
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-05-22 12:39:20 +02:00
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
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
5c6924ec6f
fix --resolve-image-digests
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-05-22 10:54:55 +02:00
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
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
9c0b922597
fix: overlapping logs and menu navigation ( #11765 )
2024-04-24 14:59:42 -04:00
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
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
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
fd532a37e7
fix(desktop): remove overly-aggressive feature flag check ( #11748 )
2024-04-19 16:06:57 -04:00
2aa568ceba
chore: fix typo in comment
...
Signed-off-by: racequite <quiterace@gmail.com>
2024-04-19 09:54:08 +02:00
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
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
c9e070f0f6
fix: return correct exit code with `--exit-code-from` ( #11715 )
2024-04-16 09:44:23 -04:00
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
d8ee474e09
Revert "Stop the resource timer after last expected event"
...
This reverts commit a4ddbcb6b2
2024-04-15 22:05:46 +02:00
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
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
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
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
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
54a525bbe6
Ignore missing containers when compose stop -p
...
Signed-off-by: koooge <koooooge@gmail.com>
2024-04-11 10:48:09 +02:00
8ceaf49296
Ignore missing containers when compose down -p
...
Signed-off-by: koooge <koooooge@gmail.com>
2024-04-11 10:48:09 +02:00
1d32592056
Introduce support for build.entitlements
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-04-10 12:27:49 +02:00
b4280fb561
e2e test for --all-resources
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-04-09 15:30:42 +02:00
29692b5921
Introduce --abort-on-container-failure
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-04-08 15:40:54 +02:00
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
466374bdd0
Unwrap error message.
...
Signed-off-by: Felix Fontein <felix@fontein.de>
2024-03-25 07:37:34 +01:00
2e85b3c265
Include error message in pull warning/errors
...
Signed-off-by: Felix Fontein <felix@fontein.de>
2024-03-25 07:37:34 +01:00
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
e9dc82011f
Add Navigation Menu to compose up
...
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
2024-03-22 17:48:25 +01:00
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
3b541b071c
Bump docker v26.0.0
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-22 14:33:56 +01:00
897d239fcb
Bump compose-go to v2.0.2
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-22 11:21:14 +01:00
c5a760ce43
add support for annotations
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-22 10:45:44 +01:00
26f687a12b
Revert "Bump compose-go to v2.0.1"
...
This reverts commit ad41461309
2024-03-21 13:43:44 -04:00
ad41461309
Bump compose-go to v2.0.1
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-21 15:54:41 +01:00
db4ed89528
feat(desktop): synchronized file share integration ( #11614 )
2024-03-20 14:41:24 -04:00
1b5fa3b93f
feat(experiments): add experimental feature state ( #11633 )
...
Use environment variable for global opt-out and Docker Desktop (if
available) to determine specific experiment states.
In the future, we'll allow per-feature opt-in/opt-out via env vars
as well, but currently there is a single `COMPOSE_EXPERIMENTAL` env
var that can be used to opt-out of all experimental features
independently of Docker Desktop configuration.
2024-03-20 13:44:27 +00:00
bc5fc6ba7e
fix `compose config --format json`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-18 08:09:54 +01:00
b2d4c1b865
fix TestBuildPlatformsWithCorrectBuildxConfig
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-15 10:38:03 +01:00
5a1ba0efcf
only use ToModel when --no-interpolate is set
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-13 06:48:24 +01:00
17d4229e57
feat(desktop): add Docker Desktop detection and client skeleton ( #11593 )
2024-03-12 09:47:41 -04:00
c525373acb
make code simpler
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-03-01 09:55:03 +01:00
e99b8acea7
avoid duplicated "xx exited with code 0" message
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-29 13:57:17 +01:00
8ab8df86e0
introduce --watch
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-28 19:04:58 +01:00
1680f9a874
restore support for `config --no-interpolate`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-28 18:54:43 +01:00
697a48af32
use an dedicated compose file --quiet-pull e2e test
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2024-02-21 18:59:09 +01:00
94246f3cac
pass QuietOption when starting dependencies from run command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2024-02-19 14:19:01 +01:00
de3da829ea
sort containers to optimize scale down
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-15 17:47:42 +01:00
c79aabde32
discard stdout for laaarge log test
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-15 16:18:58 +01:00
a220043ca0
Merge pull request #11497 from milas/rm-docker-cp-syncer
...
chore(watch): remove old `docker cp` implementation
2024-02-14 21:26:05 +01:00
e330f5905b
docs: unify no trailing dots in docstrings and help ( #11301 )
2024-02-14 14:02:37 -05:00
16c8099cf8
Use listener for file metadata
...
Signed-off-by: jhrotko <joana.hrotko@docker.com>
2024-02-14 16:51:56 +00:00
07bda5960e
fix deadlock collecting large logs
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-02-13 20:15:19 +01:00
d203402998
chore(watch): remove old `docker cp` implementation
...
This has not been the default for quite a while and required
setting an environment variable to revert back.
The tar implementation is more performant and addresses several
edge cases with the original `docker cp` version, so it's time
to fully retire it.
The scaffolding for multiple sync implementations remains to
support future experimentation here.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2024-02-13 12:56:53 -05:00
aaa7ef6de5
Include all networks in ContainerCreate call if API >= 1.44
...
Previously, we included the container's primary network in the
ContainerCreate API call, and then connected the created container
to each extra network one-by-one, by calling NetworkConnect.
However, starting API version 1.44, the ContainerCreate endpoint now
takes multiple EndpointsConfigs, allowing us to just include all the
network configurations there and skip connecting the container to each
extra network separately.
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2024-02-07 16:21:15 +01:00
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
8fdd45cd4c
chore(e2e): fix flaky test & standalone behavior ( #11382 )
2024-01-30 10:49:53 -05:00
0582001810
Fix canonical container name
...
Signed-off-by: jhrotko <joana.hrotko@docker.com>
2024-01-30 15:12:22 +01:00
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
7e991515bc
Add support for storage_opt
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2024-01-29 19:24:23 +01:00
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
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
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
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
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
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
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
5d05df6e5c
update compose-go to version using immutable Project functions
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2024-01-11 10:44:42 +01:00
Nicolas De Loof
Joana Hrotko
Cody Rigney
Suleiman Dibirov
Guillaume Lours
Felix Fontein
Paweł Gronowski
Albin Kerouanton
Sebastiaan van Stijn
Alex Bedo
Casey Korver
IDOMATH
Rob Murray
Kirill A. Korinsky
Milas Bowman
Jaime Soriano Pastor
racequite
koooge
Piotr Dąbrowski
Laura Brehm