f37e910c9f
handle GET redirects
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
2014-11-12 00:37:58 +00: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
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
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
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
49ecfd85ad
Remove the redundant include_search in mkdocs.yml
...
Upstream-commit: b92d7cd60db0a03b0ace62a2a6c11df9f64f4256
Component: engine
2014-11-10 20:23:46 +08:00
67f7f0aa89
Merge pull request #9052 from andreyst/master
...
Fix typo in Docker Links chapter of User Guide
Upstream-commit: e4fe85fc9554c09c210bb441161906f34ebe90db
Component: engine
2014-11-10 00:10:38 -05:00
1089b95bed
Merge pull request #9057 from andi5/typo-best-practices
...
Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: 1e75c9e8b40eea56e355f825b764d72ec5a89c19
Component: engine
2014-11-10 00:10:20 -05:00
f233f91529
Merge pull request #9029 from ovh/fix/doc
...
Fix Docker Hub tags list specification
Upstream-commit: 2d30473927b63788e61dfff686e63ae52fdb2687
Component: engine
2014-11-10 00:05:34 -05:00
2373a91d0b
limiting to 80 chars
...
Signed-off-by: Prasanna Gautam < prasannagautam@gmail.com >
Upstream-commit: 3600bcb53127c7d9f67d639c1f4e61c460b1d605
Component: engine
2014-11-09 19:54:00 -05:00
dc90086a2e
Fix mkdir typo in dockerfile_best-practices.md.
...
Upstream-commit: b95f9c10ff2bd05fc2d30b30bebb8174883c683a
Component: engine
2014-11-10 01:00:05 +01:00
7b7fbcfc68
Fix typo in Docker Links chapter of User Guide
...
Upstream-commit: 932cc230814ba642c493c77d05932f63c0ef3e7f
Component: engine
2014-11-09 23:23:45 +03:00
e20e8b0d30
Additional info for docker binary
...
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com >
I found that certain docker installations do not handle binding to the source directory quite right. Just writing it based on help from backjlack and tibor in IRC.
Upstream-commit: 22afaa628f319c852c536824cdd18444ddf87665
Component: engine
2014-11-09 10:28:45 -05:00
7a77c7a4b5
Remove the redundant stripComment.
...
Signed-off-by: xuzhaokui <cynicholas@gmail.com >
Upstream-commit: 6c79ee7d1e38f7b2f408105db9af7fcf9942f7ca
Component: engine
2014-11-09 23:07:44 +08:00
351d4d1e0a
pkg/namesgenerator: add Yeong-Sil Jang
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: ef150d023a4a2ea57dd2a8ebcb262a98c08feedf
Component: engine
2014-11-08 16:36:41 +02:00
e5f96cb7c0
execdriver/lxc: add comment to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6f8e42ac748e0c7597aeedf31adf81451adcda94
Component: engine
2014-11-08 16:27:25 +02:00
201bdeb454
Merge pull request #9023 from cyphar/libcontainer-update-to-new-interface
...
Update vendor'd `libcontainer` and update to use new `user` interface.
Upstream-commit: b18efeeb7affdd5b920f7aecef8eb83dd1c83d50
Component: engine
2014-11-08 16:17:28 +02:00
5ab5947fb6
*: transition to new libcontainer/user API
...
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 3ac4aa0d6ba6cb10b9a46df40f18b81dba137840
Component: engine
2014-11-08 10:03:12 +11:00
da278331e0
vendor: update vendor'd libcontainer version
...
This patch updates the vendor'd libcontainer version, so that Docker can
take advantage of the updates to the `user` API.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: a10cca257f678e5e3c866b3c35f77877fe4789d2
Component: engine
2014-11-08 09:57:20 +11:00
2f7c6a8c08
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
...
Closes #8331
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2e482c86bc14ddd4cfa45281dcf8f9ca141c9f14
Component: engine
2014-11-07 13:58:05 -08:00
6c40ac56b7
Revise Docs Maintainers list
...
Removing Sonat from docs maintainers because he no longer has time to complete all the responsibilities. Many thanks to Sonat for his help.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 480b5e9c62819da3c6bff47faaec16acb42a0185
Component: engine
2014-11-07 13:13:01 -08:00
283e88e070
Merge pull request #8931 from vbatts/vbatts-mount_pid_mountinfo
...
pkg/mount: mountinfo from specified pid
Upstream-commit: 349f67632f47a399a6a97a4a4c684b64ba8c6940
Component: engine
2014-11-07 12:04:52 -08:00
56dd7dc6ae
pkg/mount: mountinfo from specified pid
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 64e7a1722daa6508f38287c6b8eee72850f22a86
Component: engine
2014-11-07 13:37:23 -05:00
2531bb36a4
Fix Docker Hub tags list specification
...
The current implementation of the Docker Hub returns a list of objects
containing the tag name and the layer id.
Docker-DCO-1.1-Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net >
Upstream-commit: c30ccc62e447ed570ca283feedd872eb359d457b
Component: engine
2014-11-07 17:16:42 +01:00
8f685d0d4a
Not fail on updating parent links
...
Fixes #8796
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: b83fc07d88175c32bb46368a07a9c9e277b22392
Component: engine
2014-11-06 15:30:23 -08:00
b3094dae92
Merge pull request #8970 from georgexsh/hyphen
...
unify `–`(en dash) to `-` when specifying options
Upstream-commit: 3afe9dbd246982dd82f2c53b647be29ea89a6485
Component: engine
2014-11-06 14:48:48 -08:00
951245c785
Merge pull request #8711 from duglin/Issue8160
...
Add import/pull events to the stream
Upstream-commit: 734419e9c7541286e94f28c90d5ebea3a627aae5
Component: engine
2014-11-06 14:29:02 -08:00
