tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,844 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

1844 Commits

Author SHA1 Message Date
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Daniel Nephin 22bc174650 Refactor config.load() to remove reduce() and document some types. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-18 17:11:16 -04:00
Steve Durrheimer 51ce16cf18 Add zsh completion for 'docker-compose build --build' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-18 22:46:08 +02:00
Steve Durrheimer 12b38adfac Add zsh completion for 'docker-compose run --name' 
Signed-off-by: Steve Durrheimer <steve.durrheimer@netapsys.fr>
 2015-09-18 22:42:19 +02:00
Aanand Prasad fb30498153 Catch WindowsError in call_silently 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 4ae7f00412 Build Windows binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 3e4182a480 Stub 'run' on Windows 
Adapted from @dopry's work in https://github.com/docker/compose/pull/1900

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:17 +01:00
Aanand Prasad bbc8b74c17 Merge pull request #2068 from mnowster/2037-jsonschema-resolver-windows-path-fix 
Ensure RefResolver works across operating systems
 2015-09-18 18:09:58 +01:00
Mazz Mosley 5509990a71 Ensure RefResolver works across operating systems 
Slashes, paths and a tale of woe. Validation now works on windows \o/

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-18 17:51:26 +01:00
mnowster 61b819bd73 Merge pull request #2072 from albers/completion-build-pull 
Add bash completion for `docker-compose build --pull`
 2015-09-18 17:44:38 +01:00
Harald Albers 006146b2cd Add bash completion for `docker-compose run --name` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:18:06 +02:00
Harald Albers af7b98ff56 Add bash completion for `docker-compose build --pull` 
Also adds a fix for an error message on some completions when no
compose file is present:

    docker-compose build awk: cannot open docker-compose.yml (No such file or directory)

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:12:30 +02:00
Daniel Nephin db433041b4 Restore the dist volume mount for building linux binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-18 12:08:09 -04:00
Aanand Prasad 3e58003bd3 Merge pull request #2041 from ggtools/master 
Add new --pull option in build.
 2015-09-18 16:49:05 +01:00
mnowster e2ab2eb9d0 Merge pull request #2065 from dnephin/use-dind-image 
Use dockerswarm/dind image for ci
 2015-09-18 16:10:41 +01:00
mnowster 41660f98df Merge pull request #2045 from dnephin/cleanup_before_build 
Clean before doing a build
 2015-09-18 11:49:05 +01:00
Mazz Mosley 0232fb10d7 Alphabetise run options 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-18 11:30:24 +01:00
Mike Bailey aac916c73e Alphabetise reference list 
Bring in line with Glossary. https://docs.docker.com/reference/glossary/

Alphabetising list makes makes parsing by humans easier.

Signed-off-by: Mike Bailey <mike.bailey@rea-group.com>

Conflicts:
	docs/yml.md
 2015-09-18 11:25:59 +01:00
Daniel Nephin 8b29a50b52 Trim the dockerfile and re-use the virtualenv we already have. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 18:46:29 -04:00
Daniel Nephin 9978c3ea52 Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-17 17:35:49 -04:00
Aanand Prasad eb20590ca6 Use dockerswarm/dind image instead of doing docker-in-docker ourselves 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-17 16:53:20 -04:00
Daniel Nephin 577439ea7f Add a debug log message for config filenames. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:28:16 -04:00
Daniel Nephin fd75e4bf63 Update docs about using multiple -f arguments 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:20:21 -04:00
Daniel Nephin be0611bf3e Cleanup get_default_config_files tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 39ae85db8a Support a default docker-compose.override.yml for overrides 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin fe5daf860d Move find_candidates_in_parent_dirs() into a config module so that config doesn't import from cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 89be7f1fa7 Unit tests for multiple files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 831276f531 Move config_test to the correct package name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin c0c9a7c1e4 Update integration tests for multiple file support 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 10b3188214 Support multiple config files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 258d0fa0c6 Remove some functions from Command class 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 2121f5117e Add docopt support for multiple files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin aab688d27e Merge pull request #1886 from mnowster/create-host-config-needs-version 
Stop using deprecated `create_host_config` from utils
 2015-09-17 12:37:22 -04:00
Daniel Nephin 9be748f85c Clean before doing a build so that we don't include stale build artifacts 
in the binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 12:27:51 -04:00
mnowster 1c823597bb Merge pull request #1995 from predakanga/master 
Added support for IPC namespaces, fixes GH-1689
 2015-09-17 17:14:44 +01:00
Mazz Mosley 39ba2c5a7c Fix leaky tests 
It was mocking self.client but relying on the call to
utils.create_host_config which was not mocked. So now that function
has moved to also be on self.client we need to redefine the test
boundary, up to where we would call docker-py, not the result of
docker-py.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-17 17:11:00 +01:00
Mazz Mosley 6f6c04b5c9 Test what we are sending, not what we get 
This is a unit test and we are mocking the client. The method to get
the create_config_host now lives on the client, so we mock that too.

So we can test to the boundary that the method is called with the
arguments we expect.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-17 17:11:00 +01:00
Mazz Mosley 42c890796b Use docker.client.create_host_config 
create_host_config from docker.utils will be deprecated so that
the new create_host_config has access to the _version so
we can ensure that network_mode only gets set to 'default' by
default if the version is high enough and won't explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-17 17:11:00 +01:00
mnowster e7ce4c85fa Merge pull request #2040 from TomasTomecek/2024-add-logo-to-docs 
include logo in readme and docs
 2015-09-17 16:59:25 +01:00
mnowster d577cd6877 Merge pull request #2059 from ZJaffee/master 
Change Wordpress > WordPress in the documentation #2052
 2015-09-17 15:40:22 +01:00
Zachary Jaffee fb83b4c6a4 updated wordpress format syntax 
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
 2015-09-17 09:56:44 -04:00
Aanand Prasad 718f9bea17 Merge pull request #2055 from dnephin/fix_queue_lock 
Fix stacktrace when ctrl-c stops logs
 2015-09-17 11:32:23 +01:00
Daniel Nephin c2b8d5863a Merge pull request #2053 from dnephin/update_release_notes 
Add 1.4.1 release notes and download instructions
 2015-09-16 14:17:40 -04:00
mnowster 25d40bd5f2 Merge pull request #2058 from aanand/fix-docs-typo 
Fix typo in docs/index.md
 2015-09-16 16:41:37 +01:00
Aanand Prasad 1ed13f401f Merge pull request #2035 from geron/patch-1 
Fix schema.json MANIFEST.in entry
 2015-09-16 12:43:27 +01:00
Aanand Prasad bbc8765343 Fix typo in docs/index.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-16 12:38:59 +01:00
Daniel Nephin bdfb21f017 Fixes #189 - stacktrace when ctrl-c stops logs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-15 20:46:22 -04:00
Daniel Nephin 7c32fcbcf5 Add 1.4.1 release notes and download instructions. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-15 18:03:17 -04:00
Christophe Labouisse 39786d4da7 Add new --pull option in build. 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-09-15 20:19:17 +02:00
moxiegirl f49fc1867c Merge pull request #1959 from charleswhchan/patch-1 
Touch up documentation for Docker Compose.
 2015-09-15 10:17:49 -07:00