tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,071 Commits 24 Branches 268 Tags
Commit Graph

3071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
notok
3bbcc3d4d0 Fix lint error 
Signed-off-by: notok <noto.kazufumi@gmail.com>
 2021-12-08 18:42:00 +09: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
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
Ulysses Souza
e2f33af831 Merge and fix Convert function from docker/compose-switch 
This also removes the vendoring of the repo
Note that it fixes the problem of double "compose" on calling
the compose plugin with "docker" root flags.
Like in "docker --context default compose version"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
v2.2.2 		2021-12-03 12:17:17 +01:00
Guillaume Lours
19b9fdf536 upgrade version of opencontainers/image-spec (security issue) 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2021-12-03 12:16:14 +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
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
v2.2.1 		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
v2.2.0 		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
v2.1.1 		2021-11-07 11:14:00 +01:00