37ee14abc3
Merge pull request #8644 from tamsky/pull-7698-docfix
...
Add mention of e2fsprogs to runtime dependencies.
Upstream-commit: 70e3cdcdd9dba29fcbed71c772749655d5907be6
Component: engine
2014-11-13 11:07:13 -07:00
56d604e1ed
Merge pull request #8960 from LK4D4/add_nf_filter_check
...
Add check for IP_NF_FILTER
Upstream-commit: abceeb2ef5b3dad2ae0a7ca658f15aef406e8560
Component: engine
2014-11-13 11:03:29 -07:00
1a54551b00
Merge pull request #9143 from coolljt0725/cleanup_defaulttag
...
Cleanup:change "latest" to graph.DEFAULTTAG
Upstream-commit: 8f763a09d339ae733b833a000fb4f73ce9dd5180
Component: engine
2014-11-13 09:00:00 -08:00
22cdb1d809
Cleanup:change latest to graph.DEFAULTTAG
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
2014-11-13 16:21:34 +08:00
90c31c6725
Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings
...
devicemapper: split out devicemapper bindings
Upstream-commit: 42861f3b45733268da674b82bceb6deef67b5513
Component: engine
2014-11-12 19:59:36 -05:00
d82839394f
Merge pull request #8982 from rhvgoyal/save-restore-device-id
...
Save restore device Id: issue #8978
Upstream-commit: 9670871e0166658c5b6982d3ccf79a82afb9442c
Component: engine
2014-11-12 15:41:27 -08:00
4981609d4e
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
2014-11-12 15:37:34 -08:00
94f9b5175d
Merge pull request #9124 from erikh/secure-localhost
...
Secure localhost registry (carry of #8898 )
Upstream-commit: 33382385c3f58da82099f5c7fa39dd65cb8c8170
Component: engine
2014-11-12 15:25:15 -08:00
7635de650e
Merge pull request #9127 from vishh/maintainer
...
Adding Vish as a maintainer for daemon.
Upstream-commit: 2e27263aac36fa48b3d3dfcd7816bced9e4b00d4
Component: engine
2014-11-12 15:02:17 -08:00
e5982e367c
Adding Vish as a maintainer for daemon code.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 06bf79552d222ef6c4547ae8b0f3cb474a031c76
Component: engine
2014-11-12 22:55:32 +00:00
db22845d50
Merge pull request #9105 from stevenburgess/archiveCommentFix
...
Fix comment to match the arg name
Upstream-commit: 3ef2fc7f0f025d3e4fc97ccbcc75cbfa667ccb2d
Component: engine
2014-11-12 14:52:27 -08:00
a083823cc6
Merge pull request #8479 from vishh/OOM
...
Provide Out Of Memory information in container status
Upstream-commit: 08f5edce3092e55f90116fac1b6f634965008f2b
Component: engine
2014-11-12 14:15:29 -08:00
f8e94225af
registry: always treat 127.0.0.1 as insecure for all cases anytime anywhere
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 11380a109e53bc5f388b6212c12794609c0241eb
Component: engine
2014-11-12 12:14:43 -08:00
dc8c6e365a
registry: default --insecure-registry to localhost and 127.0.0.1
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 28ee373e19bbfdf47c747f6fd9385a8a75f0a483
Component: engine
2014-11-12 09:12:42 -08:00
957b4d5684
devmapper: Take care of some review comments
...
Took care of some review comments from crosbymichael.
v2:
- Return "err = nil" if file deviceset-metadata file does not exist.
- Use json.Decoder() interface for loading deviceset metadata.
v3:
- Reverted back to json marshal interface in loadDeviceSetMetaData().
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 15c74bebc1ea2d51612b5809b4477551547a8b3d
Component: engine
2014-11-12 09:36:32 -05:00
e0e5e418c1
Merge pull request #9102 from brahmaroutu/add_tag_9001
...
improve error message to print the tag
Upstream-commit: 6ad1cd5d0f3a27abb3fdb89cc4104328f1b04b49
Component: engine
2014-11-12 02:37:40 -07:00
88e594e727
Merge pull request #9079 from SvenDowideit/pr_out_update_roadmap_md_based_on_10_21_2014_dgab_meeting
...
Update ROADMAP.md based on 10/21/2014 DGAB meeting
Upstream-commit: 1396cff37593ea16514573987f48f499c7799959
Component: engine
2014-11-11 23:00:25 -08:00
3784297729
Merge pull request #9106 from duglin/TyposRemoteAPI
...
Add missing comma in docs
Upstream-commit: 492c4fc1a8027929facaea78697d57283ea3ebfd
Component: engine
2014-11-11 22:48:30 -05:00
97a0952687
Add missing comma in docs
...
Found by Michael Voznesensky <voznesenskym@gmail.com >
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 814bc06d7bf69c7775b775179c7a3edb8d30685c
Component: engine
2014-11-11 15:18:20 -08:00
40a04cf8f2
Fix comment to match the arg name
...
Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com >
Upstream-commit: 64a335ceac77dfd9eacc42e9d1f6fb2505e26e45
Component: engine
2014-11-11 18:01:08 -05:00
30c8fd82ed
Merge pull request #9041 from unclejack/lxc_maintainers_comment
...
execdriver/lxc: add comment to MAINTAINERS
Upstream-commit: e546c8cc1d4980c44e97700a04c352fc86c2f34f
Component: engine
2014-11-12 00:27:11 +02:00
4442912970
improve error message to print the tag
...
Closes #9001
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: bc45428220e4a8d05d9a0cbc701a729f7fe2aa8d
Component: engine
2014-11-11 22:18:40 +00:00
a4433b9e0f
Merge pull request #9095 from proppy/is-secure-test
...
registry: add tests for IsSecure
Upstream-commit: e08d1f6af2de6f0a402bd0e5c26fb5093fda378e
Component: engine
2014-11-11 16:52:36 -05:00
cc91da7978
registry: add tests for IsSecure
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 75e3b35bf15dd01363f8b422d6b8a4a62b1054c6
Component: engine
2014-11-11 11:02:32 -08:00
912d74662c
Merge pull request #9090 from unclejack/archive_interface
...
pkg/archive: add interface for Untar
Upstream-commit: c0499494df9a104f161ff9de93f2c186a3f8cce0
Component: engine
2014-11-11 20:57:58 +02:00
08bbce0a2c
Merge pull request #8840 from decadent/fix-da-copy-directive-reference
...
Nuh uh... quoth the build log: Source can't be a URL for COPY
Upstream-commit: d6a4d045f7f5eef0f8cbf64bee330aefed6919c1
Component: engine
2014-11-11 10:57:00 -08:00
4cef43d739
Merge pull request #9082 from SvenDowideit/pr_out_add_some_details_about_the_lifecycle_of_commands_started_with_docker_exec
...
Add some details about the lifecycle of commands started with docker exec
Upstream-commit: 9e0fac3da8f8e5ba964d3832db8e497d21633f02
Component: engine
2014-11-11 10:55:12 -08:00
24df7878cf
Merge pull request #9091 from duglin/CleanupIntTests
...
Cleanup some integration-cli output
Upstream-commit: a1310324221a381946062fde443d675990996fa2
Component: engine
2014-11-11 10:56:29 -07:00
0bfbaf6019
Cleanup some integration-cli output
...
I noticed a few things that were bugging me in the output
of the integration-cli tests.
- one of the tests used println to stdout so we had garage sent to the screen
- some of the test, in their final log message, didn't include the name of
the group/file e.g. daemon - run,iptables was just run,iptables
And yes, I noticed this because I'm anal :-) but also because we should keep
the output of the tests as clean as possible so its easy to spot it when
things go bad.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0cef21cfba5b06ce7bd5d6b68865a9df0aca95fc
Component: engine
2014-11-11 08:44:32 -08:00
4888d6a9a1
pkg/archive: add interface for Untar
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 14692d0d417378efc3456ddb810eae5646652bda
Component: engine
2014-11-11 18:28:33 +02:00
1ddc5019e6
Merge pull request #8726 from krallin/failed-start-breaks-volumes-from
...
Fix: a failed Start() breaks --volumes-from on subsequent Start()'s
Upstream-commit: 2a517fe103193e09474a4f67b60c09205042261e
Component: engine
2014-11-11 10:49:33 -05:00
55c6b50f48
Merge pull request #9071 from fredlf/add-docs-readme
...
Add link to Docs README.
Upstream-commit: 2ff203f0a60055c405afdd79a912cb7834daa36f
Component: engine
2014-11-11 07:25:09 -05:00
4549c63c46
Add some details about the lifecycle of commands started with docker exec
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 447387474a5379f941457ece191c6920191c2a35
Component: engine
2014-11-11 15:56:27 +10:00
11b8f91734
Merge pull request #9048 from coaku/b_xzk_rm_redundant_trim
...
Remove redundant stripComment
Upstream-commit: 0b4132782a7ceec6815e73a10e50d7b007d7b9dd
Component: engine
2014-11-10 21:53:22 -08:00
0d25ac96b4
Merge pull request #9050 from prasincs/patch-1
...
Additional info for docker binary
Upstream-commit: 703ef3caa825cd0433ef5c0990641e7daaa4bceb
Component: engine
2014-11-10 20:22:05 -08:00
34ab46389e
Fix 80 char. error
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: ca0885729df52698264dd10ba403eb8ab88d9642
Component: engine
2014-11-10 17:50:12 -08:00
7ddd8ca4da
Update ROADMAP.md based on 10/21/2014 DGAB meeting
...
The Docker Governance Advisory Board (DGAB) met for the first time Tue 10/21/2014.
Among other topics, the DGAB reviewed and refreshed the Docker Project Statement of Direction.
(Sven added from the Pull Req #9055 )
Docker-DCO-1.1-Signed-off-by: Scott Johnston <scott.johnston@docker.com > (github: j0hnst0n)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: d94de133f4900509821cafb5208d91443119f809
Component: engine
2014-11-11 11:43:37 +10:00
a613f7cb37
Merge pull request #9065 from tobegit3hub/master
...
Remove the redundant include_search in mkdocs.yml
Upstream-commit: 67c7faa002839ec1a038970c676772f282497370
Component: engine
2014-11-10 17:24:07 -08:00
af42de1e57
Merge pull request #9032 from fredlf/revise-docs-maintainers
...
Revise Docs Maintainers list
Upstream-commit: a1789a2eabc21defe30e90bc46edd3671b59cd7c
Component: engine
2014-11-10 17:11:25 -08:00
3e8752bcb7
properly line wrapping
...
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com >
Upstream-commit: 48424df68539965fec3056f4c349383948890896
Component: engine
2014-11-10 20:06:22 -05:00
1517c675b8
Merge pull request #9069 from cpuguy83/docs_for_pr8509
...
Add missing docs for #8509
Upstream-commit: 970e404e9b7e7cf13c107d2c8154d01956785971
Component: engine
2014-11-10 17:04:28 -08:00
af07f89fd6
fixing punctuation and grammar
...
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com >
Upstream-commit: cf19df4683f416e4d536e772dc1ff02334794264
Component: engine
2014-11-10 18:05:02 -05:00
bbc96d66b4
Cleanup api server creation
...
Current implementation is hard to reason about because of trying to mix
unix/tcp server implementations, even though they are quite different.
This cleans that up.
Also makes it possible to create and manage a new API server easily,
e.g. for adding an introspection socket to a container.
Built in such a way as to allow a non-HTTP server to work as well, such
as libchan.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dacae746b70f50dd1f3ea9d40834386b96b6c200
Component: engine
2014-11-10 16:20:35 -05:00
8ee09ed8c7
Merge pull request #9014 from LK4D4/fix_parent_failing
...
Not fail on updating parent links
Upstream-commit: 84f25414c18f726bccac10710f5971f5c5d822cd
Component: engine
2014-11-10 12:53:16 -08:00
0cba5a8261
Merge pull request #8716 from duglin/Issue8331
...
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
Upstream-commit: 4fcd3dd7488ba779c48557e90598c81c94bf74e4
Component: engine
2014-11-10 13:03:57 -07:00
3d1760b9e5
Add link to Docs README.
...
Linking to the docs readme to help would-be contributors discover the style guide and docs contribution guidelines.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 67ca7415e71a3e6389b883f746a1a15580deb892
Component: engine
2014-11-10 11:33:16 -08:00
9dbbb7d8b6
Merge pull request #9028 from unclejack/add_yeong-sil_jang
...
pkg/namesgenerator: add Yeong-Sil Jang
Upstream-commit: 3c5155ac16bbf4d02d88ad5f2c4bfef7844dad4e
Component: engine
2014-11-10 10:07:27 -08:00
13b9154cf7
Add missing docs for #8509
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 271f54aea375158b808aa50db58711e7c1d3eef5
Component: engine
2014-11-10 12:25:17 -05:00
91a104f529
Merge pull request #6810 from phemmer/4442-hairpin-nat
...
Support hairpin NAT
Upstream-commit: 0f21d9aea75ee48001fee1ce764514f943581254
Component: engine
2014-11-10 08:53:01 -08:00
507970cff9
Fix: Failed Start breaks VolumesFrom
...
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).
Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.
The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.
Fixes : #8726
Signed-off-by: Thomas Orozco <thomas@orozco.fr >
Upstream-commit: fb62e184412b6d2bf38975a7051738f05b1f413d
Component: engine
2014-11-10 17:32:16 +01:00
