59a94a0a8e
Merge pull request #1012 from chris-crone/bump-buildx
...
Bump buildx and docker vendoring
2020-12-11 14:02:03 +01:00
f55616d37b
build: Do not unnecessarily export images
...
When we do not require an image output from a `docker build` command,
we should not export an image as this just wastes time.
I believe this requires using buildx which can be enabled with
`docker buildx install`
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-11 11:17:01 +01:00
87153b9d25
local.compose.build: Ensure images are exported
...
If a user has BUILDX_NO_DEFAULT_LOAD=1 set, then the images will
not be stored in the image store unless we explicitly say that they
must be.
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-11 11:08:49 +01:00
ddaec1a367
compose.build: Wait for progress writer after build
...
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-11 10:40:09 +01:00
6e76aadfd6
deps: Bump buildx and docker vendoring
...
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-12-11 10:40:09 +01:00
817ecaabaa
Merge pull request #1047 from docker/fix-stdin-nil
...
Check if stdin is nil before closing
2020-12-11 10:20:26 +01:00
72cec58ed1
Check if stdin is nil before closing
...
getContainerStreams returns a nil stdin if the container is already running
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-11 10:08:27 +01:00
4f883cae26
Merge pull request #1044 from gtardif/compose_build_when_needed
...
No rebuild on compose up if image already exists by default
2020-12-10 18:47:12 +01:00
cf378834e5
No rebuild on compose up if image already exists by default, added first use of compose pull_policy and `compose up --build` to allow to force rebuild.
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-10 18:38:16 +01:00
bb7b47be39
Merge pull request #1041 from gtardif/compose_help
...
Adding short description to improve help on compose subcommands
2020-12-10 15:51:47 +01:00
cf0e10a431
Adding short description to improve help on compose subcommands
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-10 15:43:20 +01:00
50d434078d
Merge pull request #1037 from gtardif/fix_aci_flakyness
...
Trying to fix ACI flakyness on docker prune --force
2020-12-10 10:08:34 +01:00
15d2284e64
Merge pull request #1039 from gtardif/compose_build_e2e
...
Adding compose build e2e test
2020-12-10 10:01:26 +01:00
c806b75940
Adding compose build e2e test
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-09 17:48:43 +01:00
8faa501dd8
Merge pull request #1038 from gtardif/fix_metrics_flaky_test
...
Trying to fix flakyness on metrics e2e tests
2020-12-09 17:27:34 +01:00
177b91adc8
Trying to fix flakyness on metrics e2e tests
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-09 16:25:32 +01:00
a804136b1c
Trying to fix ACI flakyness on docker prune --force
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-09 16:16:15 +01:00
a95a76291b
Merge pull request #1019 from docker/ps_containers
2020-12-09 15:04:55 +01:00
446008a4b6
on ACI container ID is `project_service` and name is `service`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-09 14:39:10 +01:00
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
1f5a77e67c
move test to command-specific test file
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-09 10:33:52 +01:00
1d859dc807
`Ps` return ContainerSummary, not Services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-09 10:33:51 +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
Chris Crone
Djordje Lukic
Nicolas De loof
Guillaume Tardif
Guillaume Tardif