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

234 Commits

Author SHA1 Message Date
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
Lance Chen 1191023fb6 Propagate GroupAdd from ServiceConfig to HostConfig 
The `group_add` key is parsed correctly from a compose file, but it is not
passed into the `ContainerCreate` API call, thus the configuration does
not take effect. This commit fixes the issue by propagating the
configuration from Docker compose's ServiceConfig to Docker container's
HostConfig.

Signed-off-by: Lance Chen <hello@lancechen.tw>
 2021-12-17 15:08:14 +01:00
Ulysses Souza 7b6439997d Fix output redirection on command run 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-15 15:10:22 +01:00
Ulysses Souza 9e52e9fbe3
Merge pull request #9004 from ndeloof/cp_stopped 
compose cp doesn't need a full project and can copy from stopped containers
 2021-12-14 14:27:51 +01:00
Nicolas De Loof c5b7624d10
compose cp doesn't need a full project and can copy from stopped container 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-12 16:15:56 +01:00
Ulysses Souza cf7319fc6e Only kill running containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-10 08:48:38 +01:00
Nicolas De Loof 740276f550 handle "stop" event 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-09 13:57:52 +01:00
Ulysses Souza 40bca10250
Merge pull request #9007 from ulyssessouza/add-test-modes 
Add 2 modes test mechanism
 2021-12-09 11:16:37 +01:00
Ulysses Souza 8ae8d99528 Use build tags for selecting e2e test mode 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-09 10:52:18 +01:00
notok b47d8ea868 Remove intermediate containers when build succeeded 
Intermediate containers remain even when build succeeded
when building with classic way (i.e. not with buildkit).
Remove them when build succeeded like default behavior of docker build.

Signed-off-by: notok <noto.kazufumi@gmail.com>
 2021-12-08 04:18:05 +09:00
Ulysses Souza a97a73600e Add 2 modes test mechanism 
This should test on plugin and standalone mode

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-07 10:25:50 +01:00
Nicolas De Loof 6735220557 ignore missing (swarm) overlay networks 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-06 14:06:34 +01:00
Kevin Roy d7d29b25bc compose images should list created containers images 
Signed-off-by: Kevin Roy <kiniou@gmail.com>
 2021-12-05 10:59:25 +01:00
Guillaume Lours a842522f49 use filepath instead of path to check if the dockerfile path is abolute or not 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2021-12-03 12:15:22 +01:00
Ulysses Souza bc1160de72 Turn external volume usage into a warning instead of erroring 
This avoids a compatibility break since returning an error would avoid
the project to be started

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-02 13:11:20 +01:00
Nicolas De Loof 0d7567131a
compose logs to notify printer about container lifecycle events 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-02 09:18:49 +01:00
Ulysses Souza cf7b1441d9 Return an error when failing to list containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-29 10:28:45 +01:00
Mathieu Champlon 32005b0bfe
Merge pull request #8953 from ulyssessouza/test-multiargs 
Add multiargs build e2e tests
 2021-11-29 09:46:47 +01:00
Ulysses Souza 95c4502b81 Refactoring variable name 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-28 15:43:27 +01:00
Nicolas De Loof bac732837e
Don't check compose labels on external volumes 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-27 16:34:42 +01:00
Ulysses Souza b725c56c42 Fix links resolution 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-26 20:20:55 +01:00
Ulysses Souza cfcc9533b3 Add multiargs build e2e tests 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-25 21:22:30 +01:00
Mathieu Champlon cffdb69c5e Fix test config dir content 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-11-25 21:22:30 +01:00
Kyungsik Park 709190312c Fix to use Key instead of Service for graph updates 
Signed-off-by: Kyungsik Park <kay.pak@naverlabs.com>
 2021-11-24 08:02:50 +01:00
Nicolas De Loof 4dafeb57a5 introduce run —quiet-pull to align with up 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-23 19:14:12 +01:00
Albin Kerouanton 5f392258cb Don't try to start services with 0 replicas 
When a service has 0 replicas to start, it don't try to create any
container. However `composeService.startService()` still gets executed.
This method checks if there's been containers created for that service
beforehand. If there's none, it returns the following error: `no
containers to start`.

This change checks if replicas == 0 and exits early from
`composeService.startService()` when that's the case.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2021-11-23 11:57:09 +01:00
Mathieu Champlon 5754d6084c Bump compose-go to v1.0.7 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-11-22 18:13:07 +01:00
Nicolas De Loof 10cd7e130f detect volume we didn't created and ask user to explicitely mark them as external 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-19 11:04:14 +01:00
Ulysses Souza 8f9dc2e7f8
Merge pull request #8888 from PierreAntoineGuillaume/v2 
Fix typo in --wait option mechanism
 2021-11-18 12:58:28 +01:00
Ulysses Souza dfa93d834f
Merge pull request #8938 from ndeloof/run_T 
don't SetRawTerminal when run is ran with -T
 2021-11-18 12:57:12 +01:00
Nicolas De Loof f69a613e69
don't SetRawTerminal when run is ran with -T 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-18 12:40:08 +01:00
Nicolas De Loof 29179840c3 restore support for `compose build` with a git URL 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 13:08:30 +01:00
Nicolas De Loof 7205d918ad interrupt printer when `compose log` is cancelled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 12:34:52 +01:00
Guillaume Lours 413f46ade0 use Dockerfile directly when path is absolute otherwise join it with Context path 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2021-11-16 08:38:44 +01:00
Ulysses Souza e44222664a
Merge pull request #8904 from ndeloof/volumeZ 
type mismatch checking tmpfs conflicting options
 2021-11-09 10:11:11 +01:00
Nicolas De Loof 577bee955b
type mismatch checking tmpfs conflicting options 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-09 08:05:42 +01:00
Nicolas De Loof ed2395819d
better detect container will restart 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-08 14:33:04 +01:00
Pierre-Antoine Guillaume 9c01e41adf Fix typo in --wait option mechanism 
Signed-off-by: Pierre-Antoine Guillaume <pierreantoine.guillaume@gmail.com>
 2021-11-05 21:42:50 +01:00
Nicolas De Loof 6df30f39f2
golang is so ridiculous with this for..loop pattern 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-05 21:11:04 +01:00
Stephen Thirlwall 95f0431127 Fix typo in destroy event comment 
Signed-off-by: Stephen Thirlwall <sdt@dr.com>
 2021-11-04 09:13:59 +01:00
Stephen Thirlwall 2bee75c3c4 Fix formatting with gofmt -s 
Knew I'd forget something.

Signed-off-by: Stephen Thirlwall <sdt@dr.com>
 2021-11-04 09:13:59 +01:00
Stephen Thirlwall a1f7be7b5c Don't exit on container destroy events 
Fixes #8747

When the event is a container destroy, calling ContainerInspect returns
an error, because the container no longer exists. This causes both
`docker-compose up` and `docker-compose logs -f` to exit when removing a
stopped container.

This container has already emitted its die event, and has already been
cleaned up. I believe all that needs doing in this case is to early-out.

Signed-off-by: Stephen Thirlwall <sdt@dr.com>
 2021-11-04 09:13:59 +01:00
Nicolas De Loof 72e4519cbf introduce up --wait condition 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-03 18:22:29 +01:00
Ulysses Souza f10c96a54a
Merge pull request #8789 from Mygao/chore/fix-typo 
Fix typo: netwok -> network
 2021-11-02 10:49:31 +00:00
Ulysses Souza 06c5d8a902 Refactoring 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-02 10:56:03 +01:00
Ulysses Souza 0f3c214b48 Remove command.DockerCli dependency 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-02 10:56:03 +01:00
Ulysses Souza 058c779378 Add support for classic builder 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-02 10:56:03 +01:00
Ulysses Souza 284bad4411 Avoid test flakyness by ordering volumes before checking 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-31 02:25:10 +01:00
Nicolas De Loof d38f278f68
add support for EnableIPv6 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-10-28 19:32:04 +02:00
Nicolas De Loof ba08d39187
add support for DOCKER_DEFAULT_PLATFORM 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-10-28 10:28:51 +02:00
Andreas Resios e3204e7c4e Actually fix #8811 
The initial PR had the wrong boolean check. This commit addressed it.

fixes #8811

Signed-off-by: Andreas Resios <andrei.resios@gmail.com>
 2021-10-21 09:18:08 +00:00
Andreas Resios 85ef72585d Compose exec cannot process more than 32KB of data 
Fixes #8811

Signed-off-by: Andreas Resios <andrei.resios@gmail.com>
 2021-10-20 15:54:18 +00:00
Ulysses Souza 94379769e3 Make service>build>dockerfile a simple filename 
- It makes it keep a simple filename instead of an absolute path

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-20 10:24:08 +02:00
Ulysses Souza 7d768e7c1d Fix index out of range on compose.buildContainerMountOptions 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-20 10:24:05 +02:00
Ulysses Souza ea5b094a93
Merge pull request #8792 from ulyssessouza/fix-network-mode-service 
Fix network_mode "service:x"
 2021-10-20 10:21:52 +02:00
Ulysses Souza c2dd40c161 Fix network_mode "service:x" 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-14 10:40:44 +02:00
Kyungsik Park 3260dcb121 Fix typo: netwok -> network 
Signed-off-by: Kyungsik Park <kay.pak@naverlabs.com>
 2021-10-13 13:50:48 +09:00
Nicolas De Loof d48068d6e1 pass runtime option to containerCreate 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-10-12 14:10:26 +02:00
Ulysses Souza ef786f9245 Fix index out of range on compose.buildContainerMountOptions 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-11 13:27:37 +02:00