tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,580 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

2580 Commits

Author SHA1 Message Date
Nicolas De loof 7d43d39de2
Merge pull request #1616 from ndeloof/pid_namespace 
handle dependency involved by shared PID namespace
 2021-04-30 12:25:33 +02:00
Nicolas De loof 64329c2223
Merge pull request #1618 from ndeloof/remove_volume 2021-04-30 11:57:02 +02:00
Guillaume Tardif 94cf3ea202
Merge pull request #1614 from chris-crone/new-line-version 
cli.compose: Add missing \n for version
 2021-04-30 10:48:29 +02:00
Nicolas De Loof deecf76421
reduce code complexity with sub-functions 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-30 09:35:09 +02:00
Nicolas De Loof 98187b2f62
down --volume to remove volume 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-30 08:18:06 +02:00
Nicolas De Loof a93008ab1c
handle dependency involved by shared PID namespace 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-29 21:48:20 +02:00
Chris Crone a764f8c5a8 cli.compose: Add missing \n for version 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-29 18:30:58 +02:00
Nicolas De loof b46015f2f8
Merge pull request #1610 from ndeloof/build_args_from_env 2021-04-29 12:15:35 +02:00
Nicolas De loof 634ade5e8a
Merge pull request #1609 from ndeloof/exec_exitcode 2021-04-29 12:14:07 +02:00
Nicolas De Loof 15eab93b31
docker compose exec to return command exit code 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-29 10:58:45 +02:00
Nicolas De Loof e433777796
resolve build args without value from environment 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-29 10:43:09 +02:00
Nicolas De loof 962dc9478f
Merge pull request #1604 from ndeloof/bind_volume 
when bind mount has CreateHostPath set, use bind API
 2021-04-28 18:42:19 +02:00
Nicolas De Loof b33588b725
when bind mount has CreateHostPath set, use bind API 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-27 17:03:16 +02:00
Guillaume Tardif 38b4220bdb
Merge pull request #1603 from gtardif/compose-cli-plugin-version 
Separate compose CLI plugin version from Cloud integration version
 2021-04-27 10:56:59 +02:00
Guillaume Tardif 28bd7bda3e Separate compose CLI plugin version from Cloud integration version 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-27 09:16:41 +02:00
Nicolas De loof 9370ca315a
Merge pull request #1600 from gtardif/doc_readme 
Update readme and clarify relation to docker-compose
 2021-04-26 17:22:37 +02:00
Nicolas De loof a1aa6e3ef0
Merge pull request #1596 from ndeloof/override 
load sibling compose-override file when auto-discovered from parent dir
 2021-04-26 17:19:28 +02:00
Guillaume Tardif 0312556f73 Update readme and clarify relation to docker-compose 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-26 16:34:36 +02:00
Nicolas De Loof 92c9be5f87
load override sibling compose file when auto-discovered from parent dir 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-26 14:41:06 +02:00
Guillaume Tardif 8d86f578ed
Merge pull request #1594 from gtardif/fix_test_race 
Fix race in TestAttachRestart : wait for logs to appear rather than have a fixed TTL for the application
 2021-04-26 12:12:25 +02:00
Guillaume Tardif 6c5bd67c19 Fix race in TestAttachRestart : wait for logs to appear rather than have a fixed TTL for the application 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-26 12:01:24 +02:00
Nicolas De loof d99a5101a2
Merge pull request #1586 from gtardif/fix_win_test_paths 2021-04-23 16:17:11 +02:00
guillaume.tardif df7f57e227 one more windows adaptation 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
 2021-04-23 13:21:10 +02:00
Guillaume Tardif 95179f1625 Compose Cancel test not compile/run on windows (no signals) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-23 12:39:55 +02:00
Guillaume Tardif 1607370b81
Merge pull request #1588 from ndeloof/prefer_cli_plugin 
On default context, "compose" is implemented by CLI Plugin
 2021-04-23 12:28:00 +02:00
Nicolas De Loof 9123c75142 On default context, "compose" is implemented by CLI Plugin 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-23 12:06:14 +02:00
guillaume.tardif 4fa4284eb4 Adapt compose tests to pass with Desktop Windows 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
 2021-04-23 12:04:42 +02:00
Guillaume Tardif 61a448226b
Merge pull request #1587 from gtardif/cli_plugin_linux_install 
Install compose cli plugin in addition to compose-cli binary with scripted install
 2021-04-23 11:56:00 +02:00
Guillaume Tardif 14b8052d83 Install compose cli plugin in addition to compose-cli binary with scripted install 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-23 11:34:22 +02:00
Guillaume Tardif ad42fc6c4d
Merge pull request #1578 from rjruizes/patch-1 
fix typo in ecs-architecture.md
 2021-04-23 11:02:00 +02:00
Nicolas De loof fa05d4397a
Merge pull request #1539 from docker/inject 2021-04-23 11:00:02 +02:00
Guillaume Tardif de3fa40bae Handle Ctrl+C for compose CLI plugin. 
Could do something nicer passing the context to the compose command, rather than intercepting it and checking if it’s “.WithCancel” or not...

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-23 10:21:05 +02:00
Guillaume Tardif 0785114b90 Also ensure we don’t need compose cloud integration to run compose CLI plugin 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-22 22:03:52 +02:00
Nicolas De Loof db38d1244c
Retrieve compose failure category by exit code 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 18:01:28 +02:00
Nicolas De Loof d8aa00a766 wrap compose cobra command to set exitcode according to metrics status 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-22 17:51:29 +02:00
Guillaume Tardif 1fce1623ee Cross build & package compose-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
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
Roman Ruiz-Esparza 39b70e56ee fix typo in ecs-architecture.md 
Signed-off-by: Roman Ruiz-Esparza <rjruizes@ncsu.edu>
 2021-04-22 11:10:35 -04: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