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

2135 Commits

Author SHA1 Message Date
Joffrey F 3bdcc9d954 Update service tests to use mounts instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Aanand Prasad 4017ea99fe Merge pull request #2599 from dnephin/inject_project_name 
Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME
 2016-01-05 12:29:38 +00:00
Aanand Prasad c1a21d2497 Merge pull request #2577 from TomasTomecek/easier-development 
allow running compose from git
 2016-01-05 12:27:35 +00:00
Daniel Nephin 2acc29cf1c Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-04 15:37:21 -05:00
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
jake-low e760c42ae0 Stop warning about ".yaml" extension 
".yaml" is the preferred extension according to http://www.yaml.org/faq.html

Signed-off-by: jake-low <jakelow42@gmail.com>
 2015-12-02 21:45:36 -08:00
Daniel Nephin 707281aadb Merge pull request #2291 from dnephin/compose_faq 
FAQ document for Compose
 2015-12-02 11:12:37 -08:00
Daniel Nephin 3f39ffe72e FAQ document for Compose 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 10:47:32 -08:00
moxiegirl 0eba234c54 Merge pull request #2461 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-12-01 08:54:13 -08:00
Daniel Nephin 377f084dfe Increase timeout in tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 13:54:00 -05:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00