tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-06 13:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,719 Commits 21 Branches 279 Tags
Commit Graph

474 Commits

Author SHA1 Message Date
Guillaume Tardif
b987f2eaf8
Merge pull request #1023 from docker/fix-build-target 
Pass the target to buildkit
 2020-12-07 17:31:20 +01:00
Guillaume Tardif
d0728d94f2 Fix compose volume creation and check this in volume e2e test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 16:57:55 +01:00
Djordje Lukic
7d88fc61d3 Pass the target to buildkit 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-12-07 16:47:58 +01:00
Guillaume Tardif
fe363fd146 Fix compose volume creation and check this in volume e2e test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 16:42:43 +01:00
Guillaume Tardif
2657f5804e Ensure down continues (removes networks) even if containers have been removed already. Avoid returning nil error and nil project in projectFromContainerLabels 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 15:48:57 +01:00
Nicolas De loof
576aa46d21
Merge pull request #1015 from docker/logConsumer 
Revisit logs/up API to pass a LogConsumer vs io.Writer
 2020-12-07 14:57:43 +01:00
Nicolas De Loof
ca123e08eb
Revisit logs/up API to pass a LogConsumer vs io.Writer 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-07 14:47:44 +01:00
Guillaume Tardif
fea0cf8c82 Fix linter 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 14:46:31 +01:00
Guillaume Tardif
6fc8eefb1b Remove build flag for local backend 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 14:41:27 +01:00
Guillaume Tardif
ec5afcfd4d compose up and other compose commands running on “Moby” context type. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 14:41:27 +01:00
Nicolas De Loof
26fe75a7e3
Remove stopped containers on down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-07 11:39:21 +01:00
Guillaume Tardif
ff1808644c Remove flakyness in compose e2e test : can’t count networks as we have several compose stacks start in // 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-07 09:31:32 +01:00
Guillaume Tardif
d0b840bcd1 Fix compose up build when no image name in compose file. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-04 18:19:34 +01:00
Guillaume Tardif
aacd881358 Add -d flag in e2e tests now that docker compose up attaches to logs by default 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-04 15:19:12 +01:00
Guillaume Tardif
0b2eaede8c Adding unit test for bind mount creation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-04 13:49:43 +01:00
Guillaume Tardif
814536c0bd Fixing bind mount with relative path when specifying relative working dir. Added first local compose volume e2e test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-04 13:49:43 +01:00
Djordje Lukic
fcddb77b48 Give progress its own context 
The build and progress can't share the same context, the progress context
needs to live longer for the progress to be able to read all the messages
from build.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-12-04 13:05:26 +01:00
Nicolas De loof
6830ca1919
Merge pull request #1006 from gtardif/compose_fix_down_deps 
Fix service initial status in graph, in order to fix compose down duplicate removal of container
 2020-12-04 11:03:42 +01:00
Nicolas De Loof
136d09e1ac
split Up into Create+Start so logs don't collide with progress 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-04 08:16:50 +01:00
Nicolas De Loof
39e4107e12
attach to log stream by default on up 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-03 16:51:00 +01:00
Djordje Lukic
2f09b634cc Implement docker compose pull 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-12-03 16:14:38 +01:00
Guillaume Tardif
56511a4a3a renaming 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-03 15:47:19 +01:00
Guillaume Tardif
44b4bc01af In compose down progress display: prefix container names with “Container”, same as Services, Networks, homogeneous with compose up 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-03 15:46:37 +01:00
Guillaume Tardif
9d918a8ceb Fix service initial status in graph, in order to fix compose down duplicate removal of container (example : awesome-compose ELK stack) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-03 15:27:35 +01:00
Guillaume Tardif
e469b40e28 Remove duplicate ensureImagesExist() 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-02 13:51:56 +01:00
Ulysses Souza
7e4cfc0e3b Add order to down command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-12-02 13:51:11 +01:00
Guillaume Tardif
4270f383a7
Merge pull request #988 from docker/feat-platform 
Add platform when running containers
 2020-12-02 13:24:07 +01:00
Guillaume Tardif
91083bc42c
Merge pull request #1001 from gtardif/compose_build_img_name 
If compose file has a build section and no image name, build image with the right derived image tag
 2020-12-02 13:16:03 +01:00
Guillaume Tardif
7b1a602fd4 If compose file has a build section and no image name, build image with the right derived image name (project_service), like docker-compose. 
See awesome_compose/react-express-mongodb example

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-02 12:05:59 +01:00
Guillaume Tardif
5258e3d56e Add compose build flags for file and working dir 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2020-12-02 10:35:28 +01:00
Nicolas De loof
6bf76eebb1
Merge pull request #991 from gtardif/compose_network_error 
Compose network error
 2020-12-01 18:31:43 +01:00
Nicolas De Loof
a35147bc63
Detect push failure and break 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-01 16:26:01 +01:00
Nicolas De Loof
52574046f0
introduce compose push command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-12-01 14:55:52 +01:00
Guillame Tardif
b1970f618c Container networks: prefix network name only for internal networks or when name set (different from yaml key). No need to prefix again when connecting containers 
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-12-01 10:03:18 +01:00
Guillame Tardif
d24ffd97a0 Local compose error when external network not available 
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-11-30 14:49:35 +01:00
Nicolas De Loof
5952183eca
introduce compose build command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-30 12:43:38 +01:00
Djordje Lukic
1148ed8837 Add platform when running containers 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-30 11:51:46 +01:00
Guillame Tardif
4d1f265c62 Adding error progress indication when errors 
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-11-27 18:18:14 +01:00
Guillame Tardif
7ddd8e5e97 Helper methods to create progress events, more homogeneous display for “creating”, “Created”, … 
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-11-27 17:55:36 +01:00
Guillame Tardif
8b60c76684 Remove project network on compose down 
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-11-27 17:42:29 +01:00
Guillaume Tardif
9b140930a7
Merge pull request #979 from docker/console 
Don't start buildx' build with empty opts
 2020-11-27 14:54:39 +01:00
Nicolas De Loof
a542b5d37f
Don't start buildx' build with empty opts 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 14:18:06 +01:00
Guillame Tardif
bc9099de9b Ensure images are pulled/build with build first, before creating networks / volumes and starting containers. 
Will also avoid mixing build output and compose-cli progress display

Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
 2020-11-27 13:52:58 +01:00
Nicolas De Loof
b42b61e307
rename method for clarity 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 12:05:57 +01:00
Nicolas De Loof
3ff6923d2e
align coding-style with network labels 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 10:51:58 +01:00
Nicolas De Loof
49e653f142
unused context parameter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 10:29:08 +01:00
Nicolas De Loof
f65a0d3720
Create volume with labels 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 10:21:36 +01:00
Nicolas De Loof
646aca82d9
composeService to rely on apiClient 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-27 10:21:36 +01:00
Guillaume Tardif
de3b6cb450 Add compose labels for composefiles 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-26 17:13:24 +00:00
Nicolas De loof
f7905efc36
Merge pull request #960 from docker/build 2020-11-26 17:58:22 +01:00