d2b065e615
Don't raise ConfigurationError for volume driver mismatch
...
when driver is unspecified
Add testcase
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-07 18:07:41 -08:00
698998c410
Don't call create on existing volumes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-07 18:00:27 -08:00
81b7fba33e
Allowing null for build args
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-03-05 15:57:06 +02:00
9e242cdc75
Merge pull request #3032 from dnephin/multiple_files_from_env_var
...
Support multiple files in COMPOSE_FILE env var
2016-03-03 17:23:22 +00:00
4ae71f41dd
Merge pull request #2832 from aanand/refactor-cli-unit-tests
...
Refactor CLI initialization and unit tests
2016-03-02 16:10:44 -08:00
53a3d14046
Support multiple files in COMPOSE_FILE env var.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 18:47:58 -05:00
20caf02bf6
Create real Project objects in CLI unit tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 15:11:34 -08:00
4644f2c0f9
Remove environment-overriding unit test for 'run'
...
There's already an acceptance test for it
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 15:11:32 -08:00
575b48749d
Remove unused global_options arg from dispatch()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 15:09:48 -08:00
2c75a8fdf5
Extract helper methods for building config objects from dicts
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 15:09:48 -08:00
f75408923e
Merge pull request #3053 from dnephin/handle_booleans_in_mappings
...
Don't allow booleans for mapping types
2016-03-02 15:04:20 -08:00
3f98c0716e
Merge pull request #3052 from dnephin/merge_v1_logging
...
Fix merging of logging options in v1 config
2016-03-02 15:03:36 -08:00
f84ebf9b18
Merge pull request #3048 from dnephin/osx_bin_from_travis
...
Build OSX binary on Travis
2016-03-02 15:02:57 -08:00
1655be6c5b
Merge pull request #2601 from dnephin/dont_build_on_up
...
Only build as part of `up` if `--build` flag is set
2016-03-02 15:02:18 -08:00
e1b87d7be0
Update reference docs for the new flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 15:32:51 -05:00
b7fb3a6d9b
Add --build flag for up and create
...
Also adds a warning when up builds an image without the --build flag
so that users know it wont happen on the next up.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 15:32:51 -05:00
0049743615
add support for multiple compose files to bash completion
...
Since 1.6.0, Compose supports multiple compose files specified with `-f`.
These need to be passed to the docker invocations done by the
completion.
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-02 21:18:33 +01:00
3f3c05e465
Merge pull request #3049 from aanand/clarify-depends-on
...
Clarify depends_on logic
2016-03-02 11:59:06 -08:00
aa7b862f4c
Clarify depends_on logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 10:29:24 -08:00
0b3561a7d5
Merge pull request #2720 from seguins/2227-improvements-logs
...
Add flags on logs
2016-03-01 17:41:31 -08:00
af12c78915
Merge pull request #3056 from dnephin/fix_shutdown_errors
...
Fix signal handling with pyinstaller.
2016-03-01 14:56:27 -08:00
ed4473c849
Fix signal handling with pyinstaller.
...
Raise a ShutdownException instead of a KeyboardInterupt when a thread.error
is caught. This thread.error is only raised when run from a pyinstaller
binary (for reasons unknown).
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 16:39:43 -05:00
038da4eea3
Logs args of LogPrinter as a dictionary
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:24:15 +01:00
9b36dc5c54
Add --tail flag as option on logs.
...
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
d9b4286f91
Add -t, --timestamps flag as option on logs.
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
82632098a3
Add -f, --follow flag as option on logs.
...
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:43 +01:00
7684604830
Merge pull request #3023 from londoncalling/fix-note-3019
...
WIP: updated note format for dockerfile per Aanand's comments on PR #…
2016-03-01 11:11:55 -08:00
18510b4024
Don't allow booleans for mapping types.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 11:57:35 -05:00
b726f508a6
Fix merging of logging options in v1 config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 11:43:26 -05:00
04877d47aa
Build osx binary on travis and upload to bintray.
...
This requires a change to the make-branch script, to have it push the bump branch
to the docker remote instead of the user remote. Pushing to the docker remote
triggers the travis build, which builds the binary.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 11:34:54 -05:00
fc99c7ee19
Merge pull request #2584 from mjgpy3/patch-1
...
Update `volumes_from` docs to state default
2016-02-29 15:37:46 -08:00
210856179d
Merge pull request #3036 from JesusTinoco/master
...
Display in the log output the name of those containers created using …
2016-02-29 15:17:14 -08:00
f5ce31d43e
Merge pull request #3024 from aanand/update-build-image-docs
...
Update docs about using build and image together
2016-02-29 14:03:54 -08:00
4db1fef58c
Merge pull request #3022 from aanand/update-build-image-extends-note
...
Update note about build + image with extends
2016-02-29 14:03:28 -08:00
8d24af92e0
Merge pull request #3030 from aanand/document-startup-order-workarounds
...
Document ways to make services wait for dependencies
2016-02-29 13:01:32 -08:00
97c9c12660
Merge pull request #2023 from TomasTomecek/593-implement-exec
...
implement exec
2016-02-29 12:21:41 -08:00
6b947ee478
Document ways to make services wait for dependencies
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-29 11:24:58 -08:00
6bfb23baaa
Display containers name when scale a container
...
Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2016-02-29 20:19:03 +01:00
d28c5dda92
implement exec
...
Resolves #593
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-02-29 10:50:09 +01:00
62fb6b99eb
Update FAQ regarding long stop times
...
- It happens on recreate, not just stop
- We now support `stop_signal`, which can help in some cases
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-26 14:34:44 -08:00
1502c5a14d
Merge pull request #3025 from aanand/release-notes-1.6.2
...
Add release notes for 1.6.2
2016-02-26 10:36:26 -08:00
c72e9b3843
Add release notes for 1.6.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:55:04 -08:00
5be48ba1ed
Update docs about using build and image together
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:19:58 -08:00
adb8de367e
Merge pull request #2388 from dnephin/fix_long_lines
...
Wrap long lines
2016-02-25 16:52:33 -08:00
42f4d814d7
Merge pull request #2880 from dnephin/merge_jsonschemas
...
Merge jsonschemas to a single schema file per version
2016-02-25 16:51:56 -08:00
5cc420e727
WIP: updated note format for dockerfile per Aanand's comments on PR #3019
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-25 16:47:46 -08:00
c2c8c41ef2
Merge pull request #2608 from dnephin/more_cyclomatic_reduction
...
More cyclomatic complexity reduction
2016-02-25 16:41:49 -08:00
2cd1b94dd3
Update note about build + image with extends
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 15:15:18 -08:00
5111d0862c
Merge pull request #2672 from dnephin/organize_scripts
...
Organize scripts into directories
2016-02-25 14:09:03 -08:00
11dc720752
Move test scripts to script/test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:24:13 -08:00
Joffrey F
Dimitar Bonev
Aanand Prasad
Daniel Nephin
Harald Albers
Stéphane Seguin
Daniel Nephin
Jesus
Tomas Tomecek
Victoria Bialas