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
ec6bb1660d
Move run scripts to script/run
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:24:13 -08:00
a87d482a3b
Move all build scripts to script/build
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:24:13 -08:00
dc3a5ce624
Refactor config validation to support constraints in the same jsonschema
...
Reworked the two schema validation functions to read from the same schema but
use different parts of it. Error handling is now split as well by the
schema that is being used to validate.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:20:17 -08:00
43ecf8793a
Address old TODO, and small refactor of container name logic in service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
cdda616d6b
Reduce complexity of sort_service_dicts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
84a1822e40
Reduce complexity of _get_container_create_options
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
be554c3a74
Merge v1 config jsonschemas into a single file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 15:59:10 -08:00
adb64ef8d5
Merge v2 config jsonschemas into a single file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 15:59:10 -08:00
9eb1204958
Merge pull request #3010 from aanand/bump-1.6.2
...
Bump 1.6.2
2016-02-23 17:02:34 -08:00
38dd342b7b
Merge pull request #3009 from dnephin/update_release_notes
...
Add release notes for 1.6.1
2016-02-23 16:02:18 -08:00
4d720279a0
Bump 1.6.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-23 15:52:13 -08:00
796dc91eb1
Update docker-py version in requirements to 1.7.2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 15:52:13 -08:00
a7da06d920
Merge remote-tracking branch 'release/release' into bump-1.6.2
2016-02-23 15:49:21 -08:00
f48d321b5b
Merge pull request #3008 from shin-/update_dockerpy_version
...
Update docker-py version in requirements to 1.7.2
2016-02-23 15:41:11 -08:00
49ef8a271d
Add release notes for 1.6.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-23 15:13:01 -08:00
0467bc3dcf
Merge pull request #2998 from londoncalling/docs-wordpress-example
...
updated Wordpress example to be easier to follow, added/updated images
2016-02-23 15:10:11 -08:00
97bbee19b7
Update docker-py version in requirements to 1.7.2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 14:55:06 -08:00
Aanand Prasad
Daniel Nephin
Stéphane Seguin
Daniel Nephin
Jesus
Tomas Tomecek
Victoria Bialas
Joffrey F
Joffrey F