Commit Graph

1785 Commits

Author SHA1 Message Date
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
Aanand Prasad 1dabf1c366 Merge pull request #1878 from mnowster/change-default-log-driver-value
Change default `log_driver` value
2015-09-15 17:23:00 +01:00
Aanand Prasad 041a1ff08c Merge pull request #2000 from mnowster/do-not-allow-booleans-in-environment
Disallow booleans in environment
2015-09-15 16:24:59 +01:00
Mazz Mosley fb96ed113a Stop sending json-file by default
By doing this we were over-riding any of the daemon's defaults.
Instead we can send an empty string which docker-py sends on
and the daemon interprets as, 'json-file' as a default if it
hasn't got any other daemon level config options.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:47:39 +01:00
Mazz Mosley 2f45649611 Handle invalid log_driver
Now docker-py isn't hardcoding a list of valid log_drivers, we
can expect an APIError in response rather than a ValueError
if we send an invalid log_driver.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:47:39 +01:00
Mazz Mosley 4b2fd7699b Relax constraints on key naming for environment
One of the use cases is swarm requires at least : character, so going
from conservative to relaxed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
Mazz Mosley 8caeffe27e Log a warning when boolean is found in `environment`
We're going to warn people that allowing a boolean in the environment is
being deprecated, so in a future release we can disallow it. This is to
ensure boolean variables are quoted in strings to ensure they don't get
mis-parsed by YML.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
Mazz Mosley a594a2ccc2 Disallow booleans in environment
When users were putting true/false/yes/no in the environment key,
the YML parser was converting them into True/False, rather than leaving
them as a string.

This change will force people to put them in quotes, thus ensuring
that the value gets passed through as intended.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
mnowster e33ab0cdd8 Merge pull request #2031 from aanand/docker-py-1.4.0
Update docker-py to 1.4.0
2015-09-15 15:31:52 +01:00
Aanand Prasad 1bef5cd166 Merge pull request #2014 from mnowster/improve-validation-messaging
Improve oneOf schema validation messaging
2015-09-15 15:29:11 +01:00