tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,543 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

2543 Commits

Author SHA1 Message Date
Guillaume Tardif c7dc12d310 E2E tests using compose CLI plugin 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-22 17:51:29 +02:00
Guillaume Tardif 1dc97e8c4b Compose as a cli plugin 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 17:51:29 +02:00
Nicolas De Loof 85af8cdaaa local backend to rely on dockerCli's LoadDefaultConfigFile 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 17:51:28 +02:00
Nicolas De Loof 0bdad7e551 pass compose.Service to cobra commands, dependency-injection style 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 17:50:56 +02:00
Nicolas De loof f41efa3484
Merge pull request #1583 from gtardif/fix_port_display 
Fir port display assertion, Docker engine returns 2 entries in container inspect
 2021-04-22 17:46:28 +02:00
Guillaume Tardif ec693fc5f8 Fir port display assertion, Docker engine returns 2 entries in container inspect 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-22 17:34:26 +02:00
Guillaume Tardif da6cb7c8b0
Merge pull request #1581 from gtardif/fix_down_no_composefile 
Fix down not working if run from a different folder than up, because container labels stored relative paths
 2021-04-22 17:00:57 +02:00
Guillaume Tardif cc0423df6e Fix down not working if run from a different folder than up, because container labels stored relative paths 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-22 16:19:31 +02:00
Nicolas De loof 92920a03e0
Merge pull request #1579 from aiordache/build_fields 
Remove service.Build and service.PullPolicy from config hash
 2021-04-22 15:46:10 +02:00
Nicolas De loof bce61295ba
Merge pull request #1554 from docker/poll_completed 
fix race condition with init containers
 2021-04-22 09:05:33 +02:00
Nicolas De Loof c83c46293f
fix race: poll for service completion. Using waitContainer might happend after container exit 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 08:51:25 +02:00
aiordache 44d2b29d0f Remove service.Build and service.PullPolicy fields when generating the config hash 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-04-21 10:23:36 +02:00
Nicolas De loof cd4a08d0d6
Merge pull request #1530 from aiordache/recreate_after_build 2021-04-20 21:05:37 +02:00
Nicolas De loof 510ffc10a5
Merge pull request #1577 from ndeloof/stop_services 
only stop/remove selected services
 2021-04-20 21:05:03 +02:00
Nicolas De Loof 5cead2266d
only stop/remove selected services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-20 19:06:41 +02:00
aiordache c227fd5c5f refactor to reduce calls to InspectRawImage 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-04-20 15:18:08 +02:00
aiordache 31de84f547 Set image digest as service image to trigger recreation after build 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-04-20 15:15:24 +02:00
Nicolas De loof d37dffe5e2
Merge pull request #1513 from gtardif/fix_concurrent_map_writes 
Avoid panic: concurrent map writes
 2021-04-20 14:28:13 +02:00
Guillaume Tardif b96dc49bcb Avoid panic: concurrent map writes 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-20 11:13:00 +02:00
Nicolas De loof d86649140f
Merge pull request #1573 from ulyssessouza/network-progress-fix 
Fix progress writer network creation and removal
 2021-04-19 22:44:37 +02:00
Ulysses Souza 0fbeedfb6e Fix progress writer network creation and removal 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-04-19 17:27:10 -03:00
Guillaume Tardif 66f90098cd
Merge pull request #1550 from docker/local-test-cleanup 
Local test cleanup
 2021-04-19 17:51:01 +02:00
Guillaume Tardif 02b9363233 avoid assertions in defer statements. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-19 17:33:51 +02:00
Chris Crone c804b7a5a6 local.e2e: Fix Compose start/stop tests 
* Fix strings.Contains ordering
* Correct logic

Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-19 12:50:16 +02:00
Chris Crone 04bba675d2 aci-demo: Rework Dockerfiles 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-19 12:50:16 +02:00
Chris Crone c0e5fbba99 local.e2e: Reduce number of test images 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-19 12:50:16 +02:00
Nicolas De loof 9f23d9e992
Merge pull request #1562 from docker/atoi 
scale must ignore oneoff containers
 2021-04-19 12:46:41 +02:00
Nicolas De Loof a8819763b4
scale must ignore oneoff containers 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-16 09:15:22 +02:00
Nicolas De loof cd437d13f5
Merge pull request #1556 from ulyssessouza/config-volumes 
Fix volume names to print simple volume names
 2021-04-16 08:57:44 +02:00
Ulysses Souza 46a7689043 Fix volume names to print simple volume names 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-04-15 16:27:58 -03:00
Ulysses Souza fb5d51f880
Merge pull request #1541 from docker/net_bridge 
don't set aliasses if no network binding was declared
 2021-04-15 15:27:21 -03:00
Nicolas De Loof 334e362d91 don't set aliasses if no network binding was declared 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-15 16:37:57 +02:00
Anca Iordache 6a24758174
Merge pull request #1548 from docker/compose_version 
Introduce compose version command
 2021-04-15 16:29:41 +02:00
Nicolas De loof 6941445868
Merge pull request #1544 from docker/race_condition 2021-04-15 10:21:18 +02:00
Nicolas De Loof 0ab75d28ba don't report error resizing tty, as container could stop any time 
see 04dad42c3c/cli/command/container/tty.go (L71) wich always return nil

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-15 10:13:19 +02:00
Nicolas De Loof 597598cb7a only start container once we have a wait channel set, to prevent race condition with fast terminating container 
see https://github.com/docker/cli/blob/master/cli/command/container/run.go#L157-L168

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-15 10:13:19 +02:00
Guillaume Tardif d887bf7c0b
Introduce compose version command 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-15 09:18:42 +02:00
Nicolas De Loof 1dc0c4cef9
fix warning message 
close https://github.com/docker/compose-cli/issues/1536

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-14 08:19:22 +02:00
Nicolas De Loof 11c36bd9a0
rebase workflow 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-14 08:02:51 +02:00
Nicolas De Loof 7d4a768848 introduce support for /rebase 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-13 17:32:12 +02:00
Nicolas De loof a95806712a
Merge pull request #1535 from docker/revert-1533-e2e-test-improvements 
Revert "E2e test improvements"
 2021-04-13 17:15:31 +02:00
Nicolas De loof 8e8635f520
Revert "E2e test improvements" 2021-04-13 17:15:19 +02:00
Nicolas De loof 9abd990e1c
Merge pull request #1533 from chris-crone/e2e-test-improvements 2021-04-13 15:44:30 +02:00
Nicolas De loof c65ded9d1a
Merge pull request #1534 from chris-crone/bump-lint 2021-04-13 15:44:11 +02:00
Nicolas De loof 0b968395dd
Merge pull request #1516 from docker/version_json 
don't include stderr in moby exec output
 2021-04-13 15:43:27 +02:00
Nicolas De Loof 4916b36b99
don't include stderr in moby exec output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-13 15:35:26 +02:00
Chris Crone d3ca32a8a8 ci: Fix linting errors 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-13 15:35:10 +02:00
Nicolas De loof 31e93963f7
Merge pull request #1512 from docker/resize 
resize terminal and monitor SIGWINCH
 2021-04-13 15:33:33 +02:00
Nicolas De loof 5841e75cb2
Merge pull request #1532 from chris-crone/fix-scan-msg 
Fix scan message with quiet flag
 2021-04-13 15:30:23 +02:00
Chris Crone a12b1dcea0 build: Bump linter, minor fixes 
* Bump linter to 1.39.0
* Use dockerfile:1.2 syntax instead of experimental
* Fix typo in GitHub Actions

Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-13 15:19:23 +02:00