562ae32057
Merge pull request #1036 from docker/fix-compose-test
...
Don't share the compose file with ACI
2020-12-09 14:27:50 +01:00
7a841b98da
Don't share the compose file with ACI
...
ACI doesn't support service labels, we need to split
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-09 12:02:04 +01:00
15040f8473
Merge pull request #1032 from gtardif/compose_anonymous_vol
2020-12-09 10:33:42 +01:00
e4ed2b02d7
Fix container attaching to wrong volume name for compose non-external volumes. Took the opportunity to validate R/O volumes, but not related to this fix
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-08 18:48:18 +01:00
df9c96430c
Allow anonymous volumes
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-08 17:44:55 +01:00
893a469b87
Merge pull request #1030 from docker/feat-container-labels
...
compose: Add service labels
2020-12-08 16:47:43 +01:00
033941d890
compose: Add service labels
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-08 16:32:30 +01:00
b9bdcdaeb3
Merge pull request #1028 from docker/phat_phile
...
Split compose.go into command-focussed go files
2020-12-08 12:15:48 +01:00
1eb40999e2
Split compose.go into command-focussed go files
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-08 11:58:49 +01:00
5d893fc098
Merge pull request #1027 from docker/chore-move-compose-test
...
Move compose e2e tests to own folder
2020-12-08 11:41:32 +01:00
f6c4c4e590
Move compose e2e tests to own folder
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-08 11:30:25 +01:00
8ee2286126
Merge pull request #1021 from gtardif/fix_down_no_containers
...
Ensure down continues (removes networks) even if containers have been removed already
2020-12-07 17:33:26 +01:00
b987f2eaf8
Merge pull request #1023 from docker/fix-build-target
...
Pass the target to buildkit
2020-12-07 17:31:20 +01:00
54b86cd912
Merge pull request #1022 from gtardif/compose_disclaimer_moby_context
...
Display compose experimental disclaimer only for local context type or moby (default) context type
2020-12-07 17:31:08 +01:00
18db1c87ce
Merge pull request #1024 from gtardif/fix_volume_ensure
2020-12-07 17:10:02 +01:00
d0728d94f2
Fix compose volume creation and check this in volume e2e test
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:57:55 +01:00
7d88fc61d3
Pass the target to buildkit
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-07 16:47:58 +01:00
fe363fd146
Fix compose volume creation and check this in volume e2e test
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:42:43 +01:00
04cdd8dd40
Display compose experimental disclaimer only for local context type or moby (default) context type. Fixes ACI / ECS e2e tests.
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:37:14 +01:00
6aec88e74c
Merge pull request #1020 from gtardif/compose_warning
...
Add a disclaimer message for all `docker compose` commands
2020-12-07 16:07:07 +01:00
2657f5804e
Ensure down continues (removes networks) even if containers have been removed already. Avoid returning nil error and nil project in `projectFromContainerLabels`
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 15:48:57 +01:00
5c13bafac5
Add a disclaimer message for all `docker compose` commands
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 15:46:32 +01:00
576aa46d21
Merge pull request #1015 from docker/logConsumer
...
Revisit logs/up API to pass a LogConsumer vs io.Writer
2020-12-07 14:57:43 +01:00
f8bf0ac44b
Merge pull request #1018 from gtardif/compose_moby_ctx
...
`compose up` and other compose commands running on “Moby” context type.
2020-12-07 14:56:42 +01:00
ca123e08eb
Revisit logs/up API to pass a LogConsumer vs io.Writer
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-07 14:47:44 +01:00
fea0cf8c82
Fix linter
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:46:31 +01:00
6fc8eefb1b
Remove build flag for local backend
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:41:27 +01:00
a6316a90c7
Removed test checking compose has an error message on default context
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:41:27 +01:00
ec5afcfd4d
`compose up` and other compose commands running on “Moby” context type.
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:41:27 +01:00
3190456101
Merge pull request #1014 from chris-crone/containerize-go-mod-tidy
...
Containerize go mod tidy
2020-12-07 13:40:49 +01:00
78190f8346
build: Add containerized go mod tidy
...
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-07 12:22:58 +01:00
56eebade90
build: Fix syntax case
...
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-07 12:22:58 +01:00
32efa581f8
Merge pull request #1017 from docker/down_remove_stopped
...
Remove stopped containers on `down`
2020-12-07 12:18:35 +01:00
26fe75a7e3
Remove stopped containers on `down`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-07 11:39:21 +01:00
e37dd90c22
Merge pull request #1016 from gtardif/fix_compose_nw_flaky_e2e
...
Remove flakyness in compose e2e test : can’t count networks as we have several compose stacks start in //
2020-12-07 09:51:31 +01:00
ff1808644c
Remove flakyness in compose e2e test : can’t count networks as we have several compose stacks start in //
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 09:31:32 +01:00
4826d5155a
Merge pull request #1013 from gtardif/compose_build_fix
...
Fix compose up build when no image name in compose file
2020-12-06 14:59:32 +01:00
d0b840bcd1
Fix compose up build when no image name in compose file.
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 18:19:34 +01:00
3a8d57763c
Merge pull request #1009 from gtardif/compose_fix_relative_volume
...
Compose fix relative volume
2020-12-04 15:45:19 +01:00
aacd881358
Add -d flag in e2e tests now that `docker compose up` attaches to logs by default
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 15:19:12 +01:00
0b2eaede8c
Adding unit test for bind mount creation
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 13:49:43 +01:00
814536c0bd
Fixing bind mount with relative path when specifying relative working dir. Added first local compose volume e2e test
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 13:49:43 +01:00
ab8c97d31e
Merge pull request #1010 from docker/fix-ctrl-c-on-build
...
Give progress its own context
2020-12-04 13:22:09 +01:00
fcddb77b48
Give progress its own context
...
The build and progress can't share the same context, the progress context
needs to live longer for the progress to be able to read all the messages
from build.
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-04 13:05:26 +01:00
6830ca1919
Merge pull request #1006 from gtardif/compose_fix_down_deps
...
Fix service initial status in graph, in order to fix compose down duplicate removal of container
2020-12-04 11:03:42 +01:00
54c2f03424
Merge pull request #998 from docker/attach
2020-12-04 09:06:58 +01:00
136d09e1ac
split `Up` into `Create`+`Start` so logs don't collide with progress
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-04 08:16:50 +01:00
39e4107e12
attach to log stream by default on `up`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-03 16:51:00 +01:00
809c2bc45a
Merge pull request #1005 from docker/feat-compose-pull
...
Implement `docker compose pull`
2020-12-03 16:24:14 +01:00
2f09b634cc
Implement `docker compose pull`
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-03 16:14:38 +01:00
Guillaume Tardif
Djordje Lukic
Nicolas De loof
Guillaume Tardif
Chris Crone