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

3213 Commits

Author SHA1 Message Date
Ulysses Souza f791bc8a42
Merge pull request #8984 from ndeloof/logs_restart 
compose logs to notify printer about container lifecycle events
 2021-12-02 09:27:11 +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
Mathieu Champlon 7b84f2c2a5
Merge pull request #8974 from ulyssessouza/fix-links-resolution3 
Return an error when failing to list containers
 2021-11-29 10:34:00 +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
Mathieu Champlon 025a72a417
Merge pull request #8972 from ulyssessouza/fix-links-resolution2 
Refactoring variable name
 2021-11-29 09:46:24 +01:00
Ulysses Souza 95c4502b81 Refactoring variable name 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-28 15:43:27 +01:00
Ulysses Souza 2290ce2c24
Merge pull request #8970 from ndeloof/external_volume_check 
Don't check compose labels on external volumes
 2021-11-28 15:36:48 +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
Mathieu Champlon e1a38f984b
Merge pull request #8947 from ndeloof/run_quietpull 
introduce run —quiet-pull to align with up
 2021-11-23 19:17:08 +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
Nicolas De Loof 45956c36fb introduce docker compose config --images 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-23 19:13:04 +01:00
Ulysses Souza 9eb69465b7
Merge pull request #8834 from akerouanton/fix-start-0-replicas 
v2: Don't try to start services with 0 replicas
 2021-11-23 14:53:08 +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 382c1cd68e
Merge pull request #8943 from ndeloof/config_no_normalize 
don't normalize compose model in compatibility mode
 2021-11-23 11:16:36 +01:00
Mathieu Champlon 5994050f51
Merge pull request #8956 from mat007/bump-compose-go 
Bump compose-go to v1.0.8
 2021-11-23 11:10:57 +01:00
Mathieu Champlon 28a00571ef Bump compose-go to v1.0.8 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-11-23 11:05:26 +01:00
Nicolas De Loof d00eacbba0 don't normalize compose model in compatibility mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-22 21:02:44 +01:00
Ulysses Souza a6c76a9c0f
Merge pull request #8954 from mat007/bump-compose-go 
Bump compose-go to v1.0.7
 2021-11-22 18:18:41 +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
Ulysses Souza a8fbbd9e5c
Merge pull request #8936 from glours/upgrade-containerd 
upgrade containerd version - security fix
 2021-11-18 00:20:40 +01:00
Guillaume Lours ba724576a1
upgrade containerd version - security fix 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2021-11-17 23:45:06 +01:00
Nicolas De Loof 3261b60fd1 --quiet implies --progress=quiet 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 13:08:30 +01:00
Nicolas De Loof cb425a23c0 check supported --progress flag values 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 13:08:30 +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
Mathieu Champlon 8a9c4b52b4
Merge pull request #8923 from ulyssessouza/remove-env-flags-on-up 
Remove unused flag
 2021-11-14 09:06:33 +01:00
Ulysses Souza 865b82da6a Remove unused flag 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-12 14:56:27 +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
Ulysses Souza d4e3f191ac
Merge pull request #8898 from ndeloof/container_restart 
better detect container will restart
 2021-11-09 10:10:57 +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
Mathieu Champlon e6599c7213
Merge pull request #8889 from ndeloof/build_args_classic 
restore support for multiple build-args
 2021-11-07 11:14:00 +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
Ulysses Souza a79346b978 Support inherited environment vars on exec 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-05 20:51:36 +01:00
Djordje Lukic 125752c127 Update golang to 1.17 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2021-11-04 09:15:46 +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