tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,813 Commits 20 Branches 266 Tags 55 MiB
Commit Graph

90 Commits

Author SHA1 Message Date
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
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
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
Guillaume Tardif e441fbba5a Add compose labels for network 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-26 15:45:25 +01:00
Nicolas De Loof 0f4bcb9f17
Build and pull in parallel with BuildKit 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-26 14:11:40 +01:00
Nicolas De Loof a0b609a5dd
implement service image build by BuildKit 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-26 14:07:53 +01:00
Guillaume Tardif 24328c4620 Add container labels to improve compatibility with docker-compose 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-25 17:53:12 +01:00
Ulysses Souza 794a182bdd Avoid port collision with compose up test 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-11-24 11:10:17 -03:00
Ulysses Souza 8f8b97d031 Fix linter issues when running `make lint` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-11-23 17:05:40 -03:00
Djordje Lukic 5ffdaa5cca Use json progress message 
It contains the same output that `docker pull` shows

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-11-23 10:00:13 +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
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
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
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
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 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 9f594abd85 Local compose ls implementation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-19 09:48:54 +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
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 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 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