tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-15 01:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,517 Commits 20 Branches 280 Tags
Commit Graph

1411 Commits

Author SHA1 Message Date
Joffrey F
b454268f93 Merge pull request #4565 from shin-/onorua-pids-limit 
Add pids_limit to service config
 2017-03-06 18:09:53 -08:00
Joffrey F
8f8678987b Improve readability of code and output for the images command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 15:56:41 -08:00
Joffrey F
83728d2bcc Do not add mode in volume representation if it's not a host binding 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 14:43:29 -08:00
Joffrey F
b6fb3f2634 pids_limit not yet supported for swarm services - removing from v3 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 14:32:04 -08:00
Joffrey F
7512dccaa8 Add dns_opt to 2.1 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 13:28:52 -08:00
George Lester
c7b8278e78 Implemented dns_opt 
Signed-off-by: George Lester <glester491@gmail.com>
 2017-03-03 15:37:21 -08:00
Piotr Szymanski
83388ec31a enable -v flag for docker-compose run command 
Give user ability to attach volumes while running containers with
docker-compose run command. Example is given in the test implementation,
command is compatible with the one provided by docker engine.

Signed-off-by: Piotr Szymanski <skyleton@gmail.com>
 2017-03-02 16:50:24 -08:00
Yaroslav Molochko
6a151aac04 introducing pids_limit, fix for #4178 
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
 2017-03-02 16:44:26 -08:00
stefan
11329e779b added failing test that ensures that named volume will not be printed with a mode suffix 
Signed-off-by: stefan <think@hotmail.de>
 2017-03-02 15:26:40 -08:00
Jesus Tinoco
90beeaf21c 3501 - Remove a test and fix other 
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2017-03-02 15:00:55 -08:00
Jesus Tinoco
33f510b340 3501 - Add a new command option (images) 
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2017-03-02 15:00:55 -08:00
Joffrey F
6986a994a8 Merge branch 'forward-exit' of https://github.com/TheClimateCorporation/compose into TheClimateCorporation-forward-exit 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 18:04:48 -08:00
Joffrey F
b4f4ff1a6b Merge pull request #4555 from kbh2o/abort_abort 
Return exit code when exiting with --abort-on-container-exit
 2017-03-01 17:51:58 -08:00
Joffrey F
8d3c8be7d9 Merge pull request #4036 from nbarbey/master 
Fix TypeError : unorderable types: str() < int()
 2017-03-01 17:25:21 -08:00
kbroadwater
6c3641fdb7 Returing 1 when a container exits with a non-zero exit code with --abort-on-container-exit is set. Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com> 
Catching the first container to exit Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Addressing feedback and fixing tests Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Adding break and removing extra fixture files Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Moving break Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
 2017-03-01 17:08:26 -08:00
Joffrey F
1a77a7fd44 Merge pull request #3756 from nkovacs/2419-run-rm-volumes 
Remove anonymous volumes when using run --rm.
 2017-03-01 16:38:46 -08:00
Joffrey F
eca3146c9c Merge pull request #3617 from dguo/help-nonexistent-command 
Handle giving help a nonexistent command
 2017-03-01 16:31:37 -08:00
Joffrey F
9f8e01fa94 Merge pull request #3543 from milin/master 
Replace assertEquals with assertEqual in unittests since the former is getting dep…
 2017-03-01 16:27:36 -08:00
Joffrey F
9e90b6e645 Merge pull request #4553 from edsrzf/config-volumes 
Add --volumes flag to config command
 2017-03-01 14:54:46 -08:00
Joffrey F
5ff3037aa8 Merge pull request #4428 from edsrzf/parallel-pull 
Pull services in parallel
 2017-03-01 14:38:22 -08:00
Evan Shaw
d67261f26e Add --volumes flag to config command 
Closes #3609

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-03-02 10:03:31 +13:00
Joffrey F
11788ef0ff Add support for expanded port syntax in 3.1 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 12:10:51 -08:00
David McKay
1f9fb27456 Allowing running containers to be rm'd by stop flag 
Signed-off-by: David McKay <david@rawkode.com>
 2017-03-01 10:33:23 +00:00
Nathan J. Mehl
cffb76d4d9 Address comments 
- set flag name to `--exit-code-from` (and rename some variable,
  function and test names to match)
- force cascade_stop to true when exit-code-from flag is set
- use lambda in filter statement
- check that selected container name is in the project before running
- remove fancy parsing of service name to container mappings: if there
  are multiple containers in a service, return the first nonzero exit
  value if any
- flake8 changes

Signed-off-by: Nathan J. Mehl <n@climate.com>
 2017-02-27 09:51:03 -08:00
Nathan J. Mehl
a73190e1cc Add support for returning the exit value of a specific container 
Current best practice for using docker-compose as a tool for continuous
integration requires fragile shell pipelines to query the exit status
of composed containers, e.g.:

http://stackoverflow.com/questions/29568352/using-docker-compose-with-ci-how-to-deal-with-exit-codes-and-daemonized-linked
http://blog.ministryofprogramming.com/docker-compose-and-exit-codes/

This PR adds a `--forward-exitval <container>` flag that allows
`docker-compose up` to return the exit value of a specified container.
The container may optionally have a number specified (foo_2) otherwise
the first is defaulted to.

Signed-off-by: Nathan J. Mehl <n@climate.com>
 2017-02-27 08:37:11 -08:00
Joffrey F
7e8dcc847b Merge pull request #4529 from shin-/3528-invalid-service-name 
Detect the service that causes the invalid service name error
 2017-02-24 17:47:41 -08:00
Evan Shaw
e29e3f8da4 Test for parallel_execute with limit 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-25 13:14:58 +13:00
Evan Shaw
05aa8c7285 Add optional limit to the number of parallel operations 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-24 21:53:38 +13:00
Joffrey F
8b92049432 Detect the service that causes the invalid service name error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-22 16:21:23 -08:00
Joey Payne
c64f7dde04 Fix failing unit tests 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Joey Payne
33fcfca040 Add test for cache_from 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Aaron.L.Xu
d20e3f3342 function-name-modification for tests/* 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 15:25:20 +08:00
Joffrey F
abce83ef25 Fix config command output with service.secrets section 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 16:51:50 -08:00
Daniel Nephin
dc5b3f3b3e Fix secrets config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-10 17:11:24 -05:00
Daniel Nephin
c092fa37de Fix version 3.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-09 12:39:57 -05:00
Joffrey F
951497c0f2 Merge pull request #4419 from shin-/4418-healthcheck-extends 
Don't re-parse healthcheck values coming from extended services
 2017-02-03 12:24:53 -08:00
Joffrey F
e22164ec9f Merge pull request #4035 from urda/urda/compose-top 
Added `top` to `docker-compose` to display running processes
 2017-02-02 15:41:14 -08:00
Joffrey F
cf43e6edf7 Don't re-parse healthcheck values coming from extended services 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-02 14:50:53 -08:00
Joffrey F
7e8958e6ca Add missing comma in DOCKER_CONFIG_KEYS list 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-01 16:40:43 -08:00
Peter Urda
a67500ee57
Added top to docker-compose to display running processes. 
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.

This commit includes:

* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command

Signed-off-by: Peter Urda <peter.urda@gmail.com>
 2017-02-01 15:42:30 -08:00
Daniel Nephin
59d1847d9b Fix some test failures. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:40 -05:00
Daniel Nephin
4053adc7d3 Add an integration test for secrets using bind mounts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin
e0c6397999 Implement secrets using bind mounts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Joffrey F
e10d1140b9 Convert time data back to string values when serializing config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-26 11:59:22 -08:00
Joffrey F
9a0962dacb Merge pull request #4361 from shin-/4348-serialize-ext-volumes 
Remove external_name from volume def in config output
 2017-01-19 17:41:08 -08:00
Joffrey F
d83d31889e Remove external_name from volume def in config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 16:05:13 -08:00
Joffrey F
5c2165eaaf Fix volume definition in v3 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 15:41:31 -08:00
Joffrey F
1a02121ab5 depends_on merge now retains condition information when present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-18 17:52:03 -08:00
Joffrey F
56a1b02aac Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:22:16 -08:00
Joffrey F
2df31bb13c Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 16:25:40 -08:00