tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-08 14:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,719 Commits 20 Branches 280 Tags
Commit Graph

2719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Crone
65561c085a deps: Bump docker and buildx vendoring 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-12-16 10:57:42 +01:00
Nicolas De Loof
06742e3c35
Support user passing an ARN for x-aws-vpc 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-16 10:37:16 +01:00
Nicolas De loof
e983f3eda4
Merge pull request #1068 from docker/no_compose_local_windows_e2e 
Do not run compose local e2e tests on windows GHA nodes for now
 2020-12-15 17:19:59 +01:00
Guillaume Tardif
f8c750277f Do not run compose local e2e tests on windows GHA nodes for now (buildkit failing with failed to mount C:\ProgramData\docker\tmp\buildkit-mount370086869: [{Type:bind Source:C:\ProgramData\docker\windowsfilter\y3952h88q6ikevun9li41hjcb Options:[rbind ro]}]: invalid windows mount type: 'bind’). 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-15 16:21:42 +01:00
Guillaume Tardif
ebe7248a3d
Merge pull request #1067 from docker/more_aci_flakyness 
Avoiding more ACI flakyness
 2020-12-15 16:19:06 +01:00
Guillaume Tardif
d0723dcb3d Avoiding more ACI flakyness, some fixed in a804136b1c395f3a7d958d2516c8eec45b126ce7 (fixing docker prune --dry-run --force , exact same issue here with docker prune --force) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-15 15:44:53 +01:00
Guillaume Tardif
0a0bc53bae
Merge pull request #1065 from gtardif/ci-compose-e2e 
Ensure local compose E2E are run in CI.
 2020-12-15 15:33:02 +01:00
Guillaume Tardif
6d34f28beb Ensure local compose E2E are run in CI. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-15 15:24:02 +01:00
Nicolas De loof
42acaea3c9
Merge pull request #1064 from docker/public_subnets 
Only consider public subnets
 2020-12-15 14:38:55 +01:00
Nicolas De Loof
b9a3025865
Only consider public subnets 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-15 12:57:24 +01:00
Nicolas De loof
10a19b1159
Merge pull request #1062 from gtardif/fix_cli_moby_command_detect 
Make Moby command detection (based on help output) more robust.
 2020-12-15 12:38:46 +01:00
Guillaume Tardif
f55823b70f Make Moby command detection (based on help output) more robust. It seems some tabs have been replaced by spaces in CLI 20.10. Covered with e2e test TestUnsupportedCommand. 
We need to install docker CLI ourselves in Github actions nodes.

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-15 12:32:13 +01:00
Nicolas De loof
a87c5838a2
Merge pull request #1058 from ndeloof/version 
Parse --version and forward to docker/cli
 2020-12-15 09:59:33 +01:00
Nicolas De Loof
7a2e041524
Parse --version and forward to docker/cli 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-14 15:16:22 +01:00
Nicolas De loof
99de963dfc
Merge pull request #1053 from docker/aci_udp_ports 
ACI: Allow setting protocol when publishing ports
 2020-12-14 09:56:47 +01:00
Guillaume Tardif
016b04eb97
Merge pull request #1048 from chris-crone/no-export 
Do not unnecessarily export images
 2020-12-14 09:13:26 +01:00
Guillaume Tardif
cbbefa3581
Merge pull request #1052 from docker/test-compose-pull 
Add test for compose pull
 2020-12-11 17:25:26 +01:00
Djordje Lukic
331a60bb62 Add test for compose pull 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-12-11 16:54:19 +01:00
Guillaume Tardif
5f730436d4 ACI: Allow setting protocol when publishing ports 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-11 16:45:48 +01:00
Chris Crone
59a94a0a8e
Merge pull request #1012 from chris-crone/bump-buildx 
Bump buildx and docker vendoring
 2020-12-11 14:02:03 +01:00
Chris Crone
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
Chris Crone
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
Chris Crone
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
Chris Crone
6e76aadfd6 deps: Bump buildx and docker vendoring 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-12-11 10:40:09 +01:00
Djordje Lukic
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
Djordje Lukic
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
Nicolas De loof
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
Guillaume Tardif
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
Guillaume Tardif
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
Guillaume Tardif
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
Nicolas De loof
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
Guillaume Tardif
15d2284e64
Merge pull request #1039 from gtardif/compose_build_e2e 
Adding compose build e2e test
 2020-12-10 10:01:26 +01:00
Guillaume Tardif
c806b75940 Adding compose build e2e test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-09 17:48:43 +01:00
Nicolas De loof
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
Guillaume Tardif
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
Guillaume Tardif
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
Nicolas De loof
a95a76291b
Merge pull request #1019 from docker/ps_containers 2020-12-09 15:04:55 +01:00
Nicolas De Loof
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
Guillaume Tardif
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
Djordje Lukic
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
Nicolas De Loof
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
Nicolas De Loof
1d859dc807
Ps return ContainerSummary, not Services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-09 10:33:51 +01:00
Nicolas De loof
15040f8473
Merge pull request #1032 from gtardif/compose_anonymous_vol 2020-12-09 10:33:42 +01:00
Guillaume Tardif
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
Guillaume Tardif
df9c96430c Allow anonymous volumes 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-08 17:44:55 +01:00
Nicolas De loof
893a469b87
Merge pull request #1030 from docker/feat-container-labels 
compose: Add service labels
 2020-12-08 16:47:43 +01:00
Djordje Lukic
033941d890 compose: Add service labels 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-12-08 16:32:30 +01:00
Nicolas De loof
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
Nicolas De Loof
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
Nicolas De loof
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