Commit Graph

1943 Commits

Author SHA1 Message Date
Guillaume Tardif 4826d5155a
Merge pull request #1013 from gtardif/compose_build_fix
Fix compose up build when no image name in compose file
2020-12-06 14:59: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 3a8d57763c
Merge pull request #1009 from gtardif/compose_fix_relative_volume
Compose fix relative volume
2020-12-04 15:45:19 +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 ab8c97d31e
Merge pull request #1010 from docker/fix-ctrl-c-on-build
Give progress its own context
2020-12-04 13:22:09 +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 54c2f03424
Merge pull request #998 from docker/attach 2020-12-04 09:06:58 +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
Guillaume Tardif 809c2bc45a
Merge pull request #1005 from docker/feat-compose-pull
Implement `docker compose pull`
2020-12-03 16:24:14 +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 7fd60bd97b
Merge pull request #1000 from gtardif/compose_down_display
In `compose down` progress display: prefix container names with “Container”,
2020-12-03 15:58:05 +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 ebffce415c
Merge pull request #968 from docker/compose-down-in-order
Add order to down command
2020-12-02 15:07:52 +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 1d71be31b6
Merge pull request #999 from gtardif/compose_build_flags
Add compose build flags for file and working dir
2020-12-02 11:18:43 +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 bd087a713d
Merge pull request #995 from docker/compose_push 2020-12-01 18:22:54 +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 e9d20d512a
Merge pull request #989 from docker/build_command
introduce `compose build` command
2020-11-30 13:06:38 +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
Guillaume Tardif ab41285a07
Merge pull request #980 from docker/by_service
filter compose project to remove all services not required by command
2020-11-30 10:59:17 +01:00
Guillaume Tardif 96d21fe448
Merge pull request #983 from docker/refactor_progress_events
Refactor progress events
2020-11-30 10:58:30 +01:00
Nicolas De Loof b1a4dfd659
filter compose project to remove all services not required by command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-11-30 10:46:11 +01:00
Guillame Tardif fd54682109 Display “Creating”, not “Creating...”
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
2020-11-27 18:21:22 +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
Guillaume Tardif f1565a52b2
Merge pull request #982 from gtardif/compose_down_networks
Remove project network on compose down
2020-11-27 17:49:37 +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 e94646f56a
Merge pull request #978 from gtardif/fix_compose_up_display
Ensure images are pulled/build with build first, before creating networks / volumes.
2020-11-27 14:32:50 +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 c0805464f5
Merge pull request #976 from docker/volume_labels
Volume labels
2020-11-27 12:15:38 +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