tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,185 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

192 Commits

Author SHA1 Message Date
Nicolas De Loof 85a4d04096
recreate container after image has been rebuilt/pulled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-10 11:02:48 +01:00
Nicolas De Loof 5e8040ea18
don't fail trying to remove container with no candidate 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-09 16:24:16 +01:00
Guillaume Lours 7036cda306
Merge pull request #9198 from ndeloof/dockerCli_stdout 
composeService to use dockerCli's In/Out/Err streams
 2022-03-09 14:36:07 +01:00
Guillaume Lours 540ad83a6d
Merge pull request #9251 from ndeloof/device_cgroup_rules 
add support for device_cgroup_rules
 2022-03-09 13:27:53 +01:00
Guillaume Lours a97576e844
add run with dependencies e2e test 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-03-09 12:22:38 +01:00
Nicolas De Loof d8775c7a28
add support for device_cgroup_rules 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-09 11:39:20 +01:00
Nicolas De Loof 158b5ff6a3 build full compose model from resources, then filter by services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-09 11:29:30 +01:00
Nicolas De Loof 57e8e8ef29
use plain text progress when ansi=never is set 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-08 15:05:37 +01:00
Nicolas De Loof 8c7951465e filter containers after project has been rebuilt from resources 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-08 09:47:22 +01:00
Nicolas De Loof 22b8c731c7
prevent getCanonicalContainerName to crash 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-07 14:58:39 +01:00
Guillaume Lours 0ef4b90fae don't failed when trying to stop or rm services with no containers running 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-03-07 10:35:22 +01:00
Nicolas De Loof dbe7de50a7 don't try to start dependencies when there are none 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-07 08:25:05 +01:00
PIG208 bcaa908f74 Support COMPOSE_IGNORE_ORPHANS for compose run 
This revives #7020 and resolves the issue mentioned in #4992.

Signed-off-by: Zixuan James Li <359101898@qq.com>
 2022-03-05 22:54:16 +01:00
Ulysses Souza 67b4669f9b Add function to convert strings to bool 
Typically used on boolean environment variable values

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-03-04 16:42:37 +01:00
Nicolas De Loof f86f252a66 composeService to use dockerCli's In/Out/Err streams 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-03 16:34:57 +01:00
Nicolas De Loof 52eeda9aa7 report external volume name not found 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-02 08:09:31 +01:00
Ulysses Souza 16914e372e Bump compose-go 1.1.0 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-03-01 15:52:14 +01:00
Guillaume Lours ec080f184a
Merge pull request #9214 from ndeloof/inconsistent_hash 
exclude com.docker.compose.image label from service hash
 2022-02-28 10:20:36 +01:00
Nicolas De Loof b5b8e7a116
exclude com.docker.compose.image label from service hash 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-02-28 10:10:39 +01:00
Mehrad Dadar 9c68c76bea minor improvement and fix 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-27 03:40:46 +03:30
Mehrad Dadar aeb7448449 minor improvement and fix 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-25 06:26:05 +03:30
Mehrad Dadar 42c3adb236 project existence check: added error message 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-25 05:36:22 +03:30
Mehrad Dadar 35f37cd1f7 fix lint 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-25 00:00:36 +03:30
Mehrad Dadar c0465616bb check service existence in project 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-24 23:46:07 +03:30
Mehrad Dadar 32d44dfc25 added scale to toProjectName 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-24 22:39:38 +03:30
Mehrad Dadar 5885a250bc
Merge branch 'docker:v2' into issue#9147 2022-02-24 18:03:05 +03:30
Mehrad Dadar ce1c788237 minor code cleanup 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-24 14:50:50 +03:30
Mehrad Dadar 67f7b84829 modified com.docker.compose.depends_on label to contain dependency type 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-23 21:34:34 +03:30
Ulysses Souza 8a9498c571
Merge pull request #9192 from glours/wait-and-scale-0 
Wait and scale 0
 2022-02-23 12:47:34 +01:00
Mehrad Dadar 7e7262bc77
Merge branch 'docker:v2' into issue#9147 2022-02-22 05:08:29 +03:30
Nicolas De Loof 981aea674d bump buildx to 0.7.1 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-02-21 14:28:22 +01:00
Guillaume Lours 64a9e4bf01
fix cyclomatic complexity of composeService.waitDependencies function 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-02-20 11:59:26 +01:00
Guillaume Lours 4be38f84df do not stop the dependencies wait process when reaching a dependency with service_started condition 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-02-20 10:28:34 +01:00
Guillaume Lours 09e0fa94b8 do not wait for dependencies with scale 0 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-02-20 10:28:34 +01:00
Vedant Koditkar cb45c6f2df Add unit tests for combinedConfigFiles logic ✅ 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-02-18 16:37:35 +01:00
Vedant Koditkar 90ca37344f Update breaking test cases ✅ 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-02-18 16:37:35 +01:00
Vedant Koditkar fb3f9e270f Add compose file path to ls command 
docker compose ls will not include config files section in result

Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-02-18 16:37:35 +01:00
Nicolas De Loof fb9310caf2 use CustomLabels for composeV2 metadata and not impact service hash 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-02-17 09:05:54 +01:00
Mehrad Dadar ced9eba940 refactor: removed redundant code 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-17 07:55:11 +03:30
Ulysses Souza 2eeed8481d Fix pause/unpause by only applying to running containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-02-16 15:13:12 +01:00
Mehrad Dadar 65ed8cf4c2 Implemented #9147 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-05 10:27:52 +03:30
Laura Brehm a4836391a5 Set NetworkMode correctly according to network priorities 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-02-01 12:59:05 +00:00
Ulysses Souza bfd7428619
Merge pull request #9074 from ndeloof/down_volumes 
only remove volumes set by compose file
 2022-01-21 13:09:10 +01:00
Nicolas De Loof feba34e406
only remove volumes set by compose file 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-01-20 14:32:45 +01:00
Yuri Kanivetsky 37f763f009 Don't SetRawTerminal() when exec is run with -T 
Signed-off-by: Yuri Kanivetsky <yuri.kanivetsky@gmail.com>
 2022-01-19 09:11:35 +01:00
Nikhil Benesch ee586e7f1e Introduce ergonomic API for handling multiple container events 
Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 21:22:57 +01:00
Nikhil Benesch 5eb314a4ca Add progress output while waiting for dependencies 
This commit adds progress output while waiting for `depends_on`
conditions to resolve. The initial output looks like so:

     ⠿ Container chbench-zookeeper-1        Waiting      0s
     ⠿ Container chbench-kafka-1            Waiting      0s
     ⠿ Container chbench-one-off            Waiting      0s

Once all conditions have been resolved, the ouput looks like this:

     ⠿ Container chbench-zookeeper-1        Healthy      1.2s
     ⠿ Container chbench-kafka-1            Healthy      3.2s
     ⠿ Container chbench-schema-registry-1  Exited       4s

As shown above, `service_healthy` conditions result in a terminal status
of "Healthy" while `service_exited_successfully` conditions result in a
terminal status of "Exited".

Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 21:22:57 +01:00
Nikhil Benesch c5cdce0b60 Don't wait forever for unhealthy dependencies 
The previous code would wait for dependencies to become healthy forever,
even if they'd become unhealthy in the meantime. I can't find an issue
report for this bug, but it was described in a comment on the PR that
introduced the `--wait` flag [0].

[0]: https://github.com/docker/compose/pull/8777#issuecomment-965643839

Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 19:13:43 +01:00
Tymoteusz Blazejczyk 9f06a02eb5 Moved bind mode creation to getBindMode function 
Added unit tests for all uses cases.

Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
 2022-01-03 08:04:34 +01:00
Tymoteusz Blazejczyk faaa93bf12 Added volume bind option SELinux label :z :Z 
Added unsupported volume bind option SELinux label `:z` and `:Z` in v2.

It is a regression compared to v1 written in Python.

The v2 uses the compose-spec/compose-go to parse Compose YAML
specification files but there was missing support for volume bind option
SELinux label `:z` and `:Z` in parser. It is fixed in:

- https://github.com/compose-spec/compose-go/pull/213

It fixes #9072

References:

- https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label

Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
 2022-01-03 08:04:34 +01:00