tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,911 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

1911 Commits

Author SHA1 Message Date
Nicolas De loof 93490d5f4f
Merge pull request #942 from docker/chore-remove-done 
Remove useless Done in the progress writer
 2020-11-22 19:07:38 +01:00
Djordje Lukic be40bdb032 Remove useless Done in the progress writer 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-22 17:30:28 +01:00
Nicolas De loof 34e4a006c0
Merge pull request #947 from docker/feat-dependency-graph 2020-11-22 09:47:51 +01:00
Djordje Lukic 5cf5410bc8 Detect cycles 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-21 23:58:12 +01:00
Djordje Lukic 1f43b83409 Use a dependency graph to start services 
The algorithm is like so:
* get all the leaves of the graph, these are all the service that don't have any dependency
* once a service is started we take the list of its parents (dependents)
* if all the dependencies of each of those dependents are started then we can start it as well
* if not then we continue to the next dependent

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-21 22:30:32 +01:00
Nicolas De loof 162c6036b2
Merge pull request #946 from HollowMan6/patch-1 
Fix typos in `docs/aci-compose-features.md`
 2020-11-21 15:41:28 +01:00
Hollow Man b91fbb934f
Fix typos 
symetrical -> symmetrical
resoure -> resource

Signed-off-by: Hollow Man <hollowman@hollowman.ml>
 2020-11-21 22:12:37 +08:00
Nicolas De loof 7a49736d06
Merge pull request #944 from gtardif/compose_e2e 
First local compose e2e tests
 2020-11-21 13:23:00 +01:00
Guillaume Tardif aa534979bc First local compose e2e tests 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-20 18:06:11 +01:00
Guillaume Tardif a4dfe706d6
Merge pull request #943 from docker/fix_graph 
Fix processing dependency graph only onces per node
 2020-11-20 18:04:23 +01:00
Nicolas De Loof 98cc5cc1eb
Fix processing dependency graph only onces per node 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-20 17:56:27 +01:00
Ulysses Souza 3fbb9bd864 Add auto creation of Azure volumes during `compose up` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-11-20 16:34:11 +01:00
Nicolas De loof b3f406f410
Merge pull request #924 from docker/dependecy_order 2020-11-20 15:45:15 +01:00
Nicolas De Loof eeb09d9e80
apply linter recommendations 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-19 17:35:34 +01:00
Nicolas De Loof e7284e76e9
Process services in dependency order as a graph 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-19 17:31:58 +01:00
Guillaume Tardif 922a2e6296
Merge pull request #926 from gtardif/compose_ps 
compose ps implementation
 2020-11-19 16:27:09 +01:00
Guillaume Tardif ff84803546 compose ps implementation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-19 13:34:43 +01:00
Nicolas De Loof 7c7e75ca00
Ensure extensions map is not nil (should be set by compose-go) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-19 13:10:55 +01:00
Nicolas De Loof 251c52664a
Implement service_healthy dependency condition 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-19 13:10:55 +01:00
Nicolas De Loof adb62e9080
Run convergence in service dependency order 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-19 13:10:13 +01:00
Guillaume Tardif 5547204f75
Merge pull request #925 from gtardif/compose_ls 
Local compose ls implementation
 2020-11-19 11:30:07 +01:00
Guillaume Tardif 9f594abd85 Local compose ls implementation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-19 09:48:54 +01:00
Guillaume Tardif fbf5b0a7f9
Merge pull request #923 from gtardif/lint_local 
Lint local backend
 2020-11-18 17:33:51 +01:00
Guillaume Tardif 2020131105 Add local label automatically 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-18 17:23:48 +01:00
Guillaume Tardif 51142827e7 Fix linter errors 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-18 17:18:41 +01:00
Guillaume Tardif 3940b98da5 Lint packages behind feature flag : local, e2e 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-18 17:18:15 +01:00
Guillaume Tardif 181b47fcb5
Merge pull request #920 from gtardif/fix_tabs 
Fix tabs vs spaces
 2020-11-17 18:31:20 +01:00
Guillaume Tardif fff94aeb6b Fix tabs vs spaces 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-17 18:24:54 +01:00
Nicolas De loof bbcf445f1f
Merge pull request #919 from docker/compose-in-go 2020-11-17 16:23:42 +01:00
Nicolas De Loof eb60bbb74f
define const for labels 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 15:56:39 +01:00
Nicolas De Loof 2278370ffa
Handle service scale with container numbering 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 15:15:27 +01:00
Guillaume Tardif da99ad40d5 Fix logs (concurrent access to container.ID, logs was displaying the first container logs for every container) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-17 15:13:36 +01:00
Nicolas De Loof a701fd7601
Negociate API version with docker engine 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 13:44:51 +01:00
Nicolas De loof 38d2dd9b41
Merge pull request #907 from docker/aci_healthcheck_threshold 2020-11-17 13:35:01 +01:00
Nicolas De Loof 46cbb908fe
Target docker/docker 19.03 branch (api 1.40) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 13:28:58 +01:00
Nicolas De loof f68495fcfb
Merge pull request #918 from docker/fix914 
Use json to marshall ecs-local enhanced docker-compose config
 2020-11-17 12:01:55 +01:00
Nicolas De loof ebd81a2144
Merge pull request #895 from mreferre/main 
Added IAM roles/policies examples and re-ordered some of the text
 2020-11-17 11:59:29 +01:00
Nicolas De Loof 9ec075baff
document public types 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:57:38 +01:00
Nicolas De Loof 6346db1d6f
Move reconciliation logic into convergence.go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:31:14 +01:00
Nicolas De Loof 8310bb2a91
Create services in dependency order 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:31:14 +01:00
Djordje Lukic 744aebc3fd
"Already exists" also means the pull finished 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-17 11:31:14 +01:00
Djordje Lukic b0ee6d285a
Update docker/docker to be able to run this on a Mac, use goroutines when starting a stack 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-17 11:31:13 +01:00
Nicolas De Loof 9fdf69ea9c
Handle container (re)create/(re)start on compose up 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:29:12 +01:00
Nicolas De Loof 0d33e5cdcc
report docker resources creation in progress 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:28:50 +01:00
Nicolas De Loof 7944a1b94f
implement image pull on `compose up` with progress 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:28:49 +01:00
Nicolas De Loof 74de423cc3
reuse ECS logConsumer to implement formatted compose log output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:28:08 +01:00
Nicolas De Loof 3f52508efe
Skeletton implementation for compose commands 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:28:08 +01:00
Nicolas De Loof 85ec312461
convert compose model into moby API types to prepare "up" local implementation 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:28:08 +01:00
Chris Crone 367fbf35c0
Merge pull request #916 from gtardif/fix_compose_protos 
Fix proto message names for ComposeStacks() input / output ; same for ComposeServices()
 2020-11-17 11:02:46 +01:00
Nicolas De Loof 976eacd198
pass json encoded compose file to docker-compose to prevent yaml format mismatch 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-17 11:02:31 +01:00