Victor Vieux
ec888af3b0
Merge pull request #3298 from creack/add_arch_user_agent
...
Add arch/os info to user agent (Registry)
Upstream-commit: 3fe4d5477ac3b3e9761b80f808a6f5fee6cdbdf9
Component: engine
2013-12-23 12:08:26 -08:00
Andy Rothfusz
b733ad7e1a
Merge pull request #3302 from briandorsey/master
...
Added a note about a networking work-around.
Upstream-commit: cda24e345cc742f99451e43d71b3dfb49562b2d4
Component: engine
2013-12-23 11:25:20 -08:00
Andy Rothfusz
4c6a34d864
Merge pull request #3320 from jamtur01/privapi
...
API documentation update for Privileged
Upstream-commit: 88037b28779d1a8c98f3bd6d30675fb2a0a70b1e
Component: engine
2013-12-23 11:22:47 -08:00
Andy Rothfusz
4498576169
Merge pull request #3321 from jamtur01/apiclean
...
Minor style cleanups to the API spec docs
Upstream-commit: 6cdd1aa3509ca0df7cda34a4b48cddf336acad32
Component: engine
2013-12-23 11:20:56 -08:00
James Turnbull
db836da6cc
Minor style cleanups to the API spec docs
...
Upstream-commit: ea8a3438f769c85725f34c6e51d7c73ed1fff962
Component: engine
2013-12-23 11:45:51 -05:00
Tianon Gravi
9a932de625
Merge pull request #2986 from SvenDowideit/still-need-privileged
...
still need -privileged to run a build / test
Upstream-commit: 954158ce52075543b04cf012fe88dd08151d5b71
Component: engine
2013-12-23 07:58:17 -08:00
James Turnbull
93dba8079c
API documentation update for Privileged
...
The 1.7 API docs show the ability to pass Privileged
when creating a container. This is not supported as.
Privileged is now part of hostConfig and can only be
passed when starting a container.
This fixes the documentation issue.
Upstream-commit: bf17383e35afa12f5d6cb145b26542f2dc4f95de
Component: engine
2013-12-23 09:08:28 -05:00
Sven Dowideit
9526d02fc2
use the Makefile - it makes life so much simpler
...
Upstream-commit: 83d81758b0ca7de9ca38f4ea3a7eaaa8a0c275ad
Component: engine
2013-12-23 23:46:52 +10:00
Tatsuki Sugiura
d4d3461e31
Fix glob expansion for no-cache setting.
...
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.
This patch fixes to quote to work cache clean command properly.
Upstream-commit: e3b878ce983e5e01960ba5ec5c330749df7dcac4
Component: engine
2013-12-23 17:27:22 +09:00
James Turnbull
5330cfa4e1
Merge pull request #3308 from crigor/patch-1
...
Change an to a
Upstream-commit: 1e5f9334e0746399856b8f1e0f7ebd28947bcee8
Component: engine
2013-12-21 15:12:50 -08:00
Daniel Exner
2bbee621e7
+ added missing link in index.rst
...
* some gramatic and spelling fixes
Thx jamtur :)
Upstream-commit: 3edbf416bfaed2c7bacc3c5ef572efb59b4e2082
Component: engine
2013-12-22 00:00:20 +01:00
James Turnbull
05c72ace17
Merge pull request #3272 from SvenDowideit/more-complete-run-cmd-example
...
A more complete example of docker run.
Upstream-commit: c2364b978de2bae79e96e53e90519ece169cf24f
Component: engine
2013-12-21 14:52:41 -08:00
Daniel Exner
b028910bf6
Installation for FrugalWare
...
Upstream-commit: 158e3d60ec016778b2a2615885f6a880509644f3
Component: engine
2013-12-21 23:38:13 +01:00
apocas
c6977efcc7
Wrong HTTP method in events endpoint.
...
Upstream-commit: e4e579b40d79764781cbb0a63d12d307ca8a71dc
Component: engine
2013-12-21 16:41:41 +00:00
Christopher Rigor
f27c5dcccd
Change an to a
...
Upstream-commit: 071528e1033623b4c2da7450b4492616101dd018
Component: engine
2013-12-21 16:23:13 +08:00
Victor Vieux
59030d2aa2
Merge pull request #3306 from roylee17/3224-fix-udp-cleanup
...
network: fix a typo in udp cleanup path
Upstream-commit: a2fcd3d8f0c57fae8d1c19db77093b44437c1318
Component: engine
2013-12-21 00:03:07 -08:00
Tzu-Jung Lee
3658b14c94
network: fix a typo in udp cleanup path
...
Fix #3224 - Port already in use error when running a container
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
Upstream-commit: 7d2e851d8e921bf8f07f54c8afb8262580b36e8d
Component: engine
2013-12-20 17:54:54 -08:00
Victor Vieux
6071fba45d
fix progressbar in docker push
...
Upstream-commit: 85f9b778f54a823566dd5d81e0e0a9875a64569d
Component: engine
2013-12-20 16:55:41 -08:00
Victor Vieux
a0bbcd5fb8
discard test output
...
Upstream-commit: 369cde4ad7b2618e24294839761b743c5c25911b
Component: engine
2013-12-20 16:50:31 -08:00
Victor Vieux
c7db09e4c6
Merge branch 'test-container-orphaning' of https://github.com/gabrtv/docker into prevent_orphan_deletion
...
Upstream-commit: 3ffc52bcf5a807e7cd2995443d94e89fab8dc2c6
Component: engine
2013-12-20 16:27:33 -08:00
Victor Vieux
bfdf325ac2
prevent orphan
...
Upstream-commit: 8dcca2125a2176924ea9d816214d88b8b6450bf2
Component: engine
2013-12-20 16:26:02 -08:00
Brian Dorsey
652202543c
Update MTU work-around to use the new -mtu flag
...
Upstream-commit: cdd14b1a31603e602ab36522582b4356264ccb60
Component: engine
2013-12-20 16:19:35 -08:00
Brian Dorsey
118dcafff9
Added a note about a networking work around.
...
An additional flag to limit the networking MTU is required in three Compute Engine zones for reliable networking from inside the docker container. Added a warning to that effect to the QuickStart guide.
Upstream-commit: 37ed178611622da42e3a4a0aed2288b00b4eb208
Component: engine
2013-12-20 16:06:28 -08:00
Gabriel Monroy
b58bf0fa05
add TestContainerOrphaning integration test
...
Upstream-commit: c995c9bb91a2bf5b2038330d063a073d2e0c611c
Component: engine
2013-12-20 16:52:34 -07:00
Michael Crosby
fd15c72b59
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
Upstream-commit: aa619de748e2337f6bb7aac62c212811ac709c1e
Component: engine
2013-12-20 13:21:56 -08:00
Michael Crosby
5da4f518c9
Merge pull request #3300 from crosbymichael/fix-mountinfo-parsing
...
Only parse upto the mountpoint in mountinfo
Upstream-commit: 6fde28c2932c0f6691856df39ae5ca3f77ef0f22
Component: engine
2013-12-20 13:21:20 -08:00
Michael Crosby
eeb209ee58
Merge pull request #3291 from dineshs-altiscale/3282-sparse-files
...
Add -S option to tar for efficient sparse file handling
Upstream-commit: f4358fc647c8b6fa609447f45f332187aab6813b
Component: engine
2013-12-20 11:10:31 -08:00
Michael Crosby
445ec23b8b
Merge pull request #3294 from discordianfish/3293-better-error-dockerfile-empty
...
Return error if Dockerfile is empty
Upstream-commit: 57e19b14757e737e14fd3ba75931d63048f2b54b
Component: engine
2013-12-20 10:45:56 -08:00
Michael Crosby
70588a9762
Only parse upto the mountpoint in mountinfo
...
Upstream-commit: 8051b6c1a1f9c381d42f5c776020658700c63c57
Component: engine
2013-12-20 13:34:05 -05:00
Michael Crosby
44050b9219
Allow mtu to be configured at daemon start
...
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05:00
Guillaume J. Charmes
c47d358db6
Add dynamic os/arch detection to Images
...
Upstream-commit: f9359f59a88f109a7764406c33529a20098b0c7f
Component: engine
2013-12-20 08:20:08 -08:00
Guillaume J. Charmes
9e800ce4e1
Add arch/os info to user agent (Registry)
...
Upstream-commit: e4561438f1156a96ee7fd2e25a8b9e6a3831fa83
Component: engine
2013-12-20 08:19:25 -08:00
jaseg
7529ef336e
Return meaningful error for meaningless Dockerfiles
...
Upstream-commit: b8cd2bc94d58e9ca1c6f9a41979b857cfa4b698f
Component: engine
2013-12-20 16:19:21 +01:00
Johannes 'fish' Ziemke
0b51803275
Return error if Dockerfile is empty
...
Upstream-commit: f7ba1c34bb7670b1a8d761b73eb9a775fa0f6bbe
Component: engine
2013-12-20 14:13:52 +01:00
Sven Dowideit
8afb99df88
make a more complete example of docker run, showing the use of most of the options ( Closes #1500 )
...
Upstream-commit: df87919165e8874fe53d9405e3833bbaff4f0147
Component: engine
2013-12-20 20:06:07 +10:00
Dinesh Subhraveti
e69eef70c1
Add -S option to tar for efficient sparse file handling
...
Fixes issue #3282
Upstream-commit: 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593
Component: engine
2013-12-19 21:41:22 -08:00
Andy Rothfusz
31ff556216
Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
...
Update docs to include images for docker inspect
Upstream-commit: efde305c05fe1969b6116f4ee777e5c37d30d139
Component: engine
2013-12-19 14:50:55 -08:00
Guillaume J. Charmes
cf1704f27a
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
Victor Vieux
6332a18092
Merge pull request #3273 from crosbymichael/set-mtu-in-dockerinit
...
Move MTU setting outside of lxc and set with netlink
Upstream-commit: 93abcc3a3b06171daedba8af95120d5c220d8712
Component: engine
2013-12-19 14:25:27 -08:00
Tianon Gravi
c6dd97f16f
Merge pull request #3244 from codeaholics/remove-apt-errors-during-build
...
Tidy up some of the error messages from apt during build
Upstream-commit: c3ec6962847222ea66b90d4517c6339992399ac8
Component: engine
2013-12-19 13:28:56 -08:00
Michael Crosby
7352b14d79
Merge pull request #3288 from tianon/makefile-maintainer
...
Add Tianon as Makefile maintainer
Upstream-commit: fdd81b423b1a1743ca0954a4f936f3ea422ad219
Component: engine
2013-12-19 13:26:52 -08:00
Tianon Gravi
36b27a819f
Add Tianon as Makefile maintainer
...
Upstream-commit: cd89fe5c4f342adae870a04f04729e3b50ae20ea
Component: engine
2013-12-19 13:42:35 -07:00
Tianon Gravi
506d5d5cf2
Merge pull request #3283 from jpoimboe/update-vendor.sh
...
add gosqlite to vendor.sh
Upstream-commit: 1636ed9826440e11dbcc4cd89a02082368896f78
Component: engine
2013-12-19 12:37:25 -08:00
pandrew
f4c2be3a58
Update docs to include images for docker inspect
...
Upstream-commit: 8072d3a4e009f404fbc31507887c3418ea7327fc
Component: engine
2013-12-19 20:55:19 +01:00
Josh Poimboeuf
d29d3cbd93
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
Upstream-commit: d215724ad6f70a783cb00b77f3c1a0cf9f69c83e
Component: engine
2013-12-19 13:51:46 -06:00
Michael Crosby
0bf2305d2f
Move MTU setting outside of lxc and set with netlink
...
Upstream-commit: 0e6f0c4e02f4a29a1495f68f8aa52c5a10f587da
Component: engine
2013-12-19 11:51:44 -08:00
Andy Rothfusz
498aab65bc
Merge pull request #3284 from jamtur01/faqmore
...
Added some more items to the FAQ
Upstream-commit: 629cc2fce4a3c29cc0d1dea63d2c4729c729d001
Component: engine
2013-12-19 11:32:53 -08:00
James Turnbull
b1321196bf
Added some more items to the FAQ
...
Upstream-commit: 8c52140059c83b9ef6f4f9336f162945cd360c4f
Component: engine
2013-12-19 14:27:47 -05:00
Victor Vieux
dbe3d58b07
Merge pull request #3271 from crosbymichael/mount-outside
...
Perform docker specific mounts outside of lxc
Upstream-commit: f21bd80e90af12745c7a8bf98d84ec50c3295987
Component: engine
2013-12-19 11:13:31 -08:00
Guillaume J. Charmes
12888b58b8
Merge pull request #3243 from alexlarsson/compressed-tar
...
Handle compressed tars in ApplyLayer
Upstream-commit: 4bdd4599f0aa539c3266e29917eef07ca38058b5
Component: engine
2013-12-19 11:02:32 -08:00