tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,568 Commits 22 Branches 267 Tags 56 MiB
Commit Graph

2568 Commits

Author SHA1 Message Date
Tomas Tomecek adde805829 allow running compose from git 
with:

```
$ git clone docker/compose && cd compose
$ export PYTHONPATH="$PWD:$PYTHONPATH"
$ python -m compose --help
```

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-12-26 11:03:58 +01:00
Daniel Nephin ea8cc1c3dc Merge pull request #2562 from thaJeztah/update-links 
Update links
 2015-12-21 08:31:39 -08:00
Aanand Prasad a2d2915a64 Merge pull request #2547 from seguins/1125-docker-compose-create 
Add docker-compose create command.
 2015-12-21 14:20:56 +00:00
Sebastiaan van Stijn 5ed559fa0e Update links 
Updates some links to their new locations, and
replaces some http:// with https:// links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-21 01:52:54 +01:00
Aanand Prasad 12a08255b5 Merge pull request #2554 from aanand/clarify-rm-behaviour 
Clarify behaviour of 'rm'
 2015-12-18 16:42:05 +00:00
Stéphane Seguin 3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Aanand Prasad 2e9a49b4eb Clarify behaviour of 'rm' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-17 17:50:45 +00:00
Aanand Prasad 100d6f2fbb Merge pull request #2552 from dbonev/2452-implement-cpu-quota 
Added support for cpu_quota flag
 2015-12-17 12:21:15 +00:00
Dimitar Bonev a542041264 Added support for cpu_quota flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-16 21:25:30 +02:00
Aanand Prasad c8f63306e0 Merge pull request #2550 from dbonev/1236-restart-to-exit-with-non-zero 
Start, restart, pause and unpause exit with non-zero if nothing to do
 2015-12-16 15:25:34 +00:00
Aanand Prasad ae7e48ea2f Merge pull request #2526 from dnephin/remove_extra_coverage_files 
Ignore extra coverage files
 2015-12-16 15:18:10 +00:00
Dimitar Bonev bc843d6758 Start, restart, pause and unpause exit with non-zero if nothing to do 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-15 23:11:11 +02:00
Daniel Nephin 5b32d32b2d Merge pull request #2521 from jeanpralo/master 
Add method to get more info about container status
 2015-12-15 12:04:42 -08:00
Jean Praloran c8f266b637 add restarting status for human_readable_state 
Signed-off-by: Jean Praloran <jeanpralo@gmail.com>
 2015-12-16 08:19:28 +13:00
Daniel Nephin a1217dc050 Merge pull request #2536 from dbonev/2345-incorrect-network-name 
Incorrect network name shown in the log when no driver is specified
 2015-12-11 14:39:36 -08:00
Dimitar Bonev 6d709caaa5 Fixes incorrect network name shown in the log when no driver is specified 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-11 10:14:01 +02:00
Daniel Nephin 1d3aeaaae7 Ignore extra coverge files 
These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-10 15:29:36 -08:00
Aanand Prasad bc09698897 Merge pull request #2527 from dnephin/fix_dns_config_option 
Fix dns and dns_search when used strings and without extends.
 2015-12-10 11:31:01 +00:00
Daniel Nephin fa3528ea25 Fix dns and dns_search when used strings and without extends. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-09 16:32:39 -08:00
Daniel Nephin 6fe747e0ee Merge pull request #2522 from sdurrheimer/zsh-completion-config-cmd 
Add zsh completion for config subcommand
 2015-12-09 10:40:44 -08:00
Aanand Prasad 0b7a407055 Merge pull request #2519 from seguins/clean_service 
Remove unused functions in service
 2015-12-09 13:51:27 +00:00
Aanand Prasad 67829f08b6 Merge pull request #2518 from albers/completion-config 
Add bash completion for config subcommand
 2015-12-09 12:43:41 +00:00
Steve Durrheimer 01bba5ea23 Add zsh completion for config subcommand 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-09 08:57:14 +01:00
Stéphane Seguin 999d15b225 Remove unused functions in service 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-08 21:11:05 +01:00
Harald Albers a5b48a3dc2 Add bash completion for config subcommand 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-08 10:23:55 -08:00
Aanand Prasad dc39b01e00 Merge pull request #2512 from albers/completion-url 
Use more robust download URL for completions
 2015-12-08 16:27:09 +00:00
Aanand Prasad 53cc99a822 Merge pull request #2513 from punkstar/detect-tty 
Only allocate a tty if we detect one
 2015-12-08 15:26:46 +00:00
Aanand Prasad 82dfd465a2 Merge pull request #2407 from dnephin/config_command 
New `docker-compose config` command
 2015-12-08 15:16:48 +00:00
Daniel Nephin 437f3f8adb Add docker-compose config subcommand. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-07 18:51:01 -08:00
Aanand Prasad ecf2dd11f9 Merge pull request #2467 from dnephin/remove_migrate_to_labels 
Remove migrate-to-labels.
 2015-12-07 14:31:23 +00:00
Aanand Prasad 9f4e83e456 Merge pull request #2466 from dnephin/remove_insecure_ssl_warning 
Removes the deprecated --allow-insecure-ssl flag
 2015-12-07 14:29:33 +00:00
Aanand Prasad 50dcb1d7e7 Merge pull request #2468 from dnephin/increase_timeout_in_tests 
Increase timeout in tests
 2015-12-07 14:29:08 +00:00
Nick Jones f2c232bb10 Only allocate a tty if we detect one 
Signed-off-by: Nick Jones <nick@nicksays.co.uk>
 2015-12-07 09:56:28 +00:00
Harald Albers 2525752a05 Use more robust download URL for completions 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-07 09:10:19 +01:00
Daniel Nephin 509059cdab Merge pull request #2492 from jake-low/no-yaml-warning 
Stop warning about ".yaml" file extension
 2015-12-04 12:22:56 -08:00
Daniel Nephin 3e7b2ab865 Merge pull request #2506 from dnephin/update_changelog 
Cherry-pick release notes for 1.5.2
 2015-12-04 12:21:27 -08:00
Daniel Nephin de4a18ea6c Cherry-pick release notes for 1.5.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-04 10:26:20 -08:00
Aanand Prasad 0a84833474 Merge pull request #2505 from thaJeztah/update-maintainers 
update maintainers file for parsing
 2015-12-04 16:16:09 +00:00
Sebastiaan van Stijn 7698da57ca update maintainers file for parsing 
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-04 16:52:29 +01:00
Daniel Nephin 8f48fa4747 Merge pull request #2491 from dnephin/bump-1.5.2 
WIP: Bump 1.5.2
 2015-12-03 17:11:51 -08:00
Daniel Nephin 7240ff35ee Bump 1.5.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:18:32 -08:00
Daniel Nephin aaf66e3485 FAQ document for Compose 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:05:06 -08:00
Aanand Prasad 96f4a42a35 Validate the 'expose' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad e6fbca42a1 Split out ports validation tests into type, uniqueness, format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad 527bf3b023 Fix ports validation message 
- The `raises` kwarg to the `cls_check` decorator was being used
  incorrectly (it should be an exception class, not an object).

- We need to check for `error.cause` and get the message out of the
  exception object.

NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad ab36c9c6cd Refactor ports section of fields schema 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad e67419065a Fix ports validation test 
We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Daniel Nephin 69e956ce8b Add integration test and docs for build with a git url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:05:05 -08:00
Jonas Eckerström 0dbd99bad2 Added support for url buid paths 
Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
 2015-12-03 11:05:05 -08:00
Daniel Nephin fa975d7fbe Properly resolve environment from all sources. 
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:05:01 -08:00