bda9d074fe
devmapper: remove extra space in DefaultThinpBlockSize assignment
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: f9c078ef38106d00de7774374f3ac71bb0d562d3
Component: engine
2014-06-24 12:43:45 -04:00
e00d89f257
devmapper: Add option for specifying the thin pool blocksize
...
Add dm.blocksize option that you can use with --storage-opt to set a
specific blocksize for the thin provisioning pool.
Also change the default dm-thin-pool blocksize from 64K to 512K. This
strikes a balance between the desire to have smaller blocksize given
docker's use of snapshots versus the desire to have more performance
that comes with using a larger blocksize. But if very small files will
be used on average the user is encouraged to override this default.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 09ee269d998ad04733ef577739fa051df9d3f12e
Component: engine
2014-06-24 12:10:28 -04:00
d61150b2d4
devmapper: use RAMInBytes() rather than FromHumanSize()
...
Device Mapper needs device sizes in binary (1024) multiples. Otherwise
kernel checks can find that the specified thin-pool device sizes aren't
a multiple of the specified thin-pool blocksize.
The name for "RAMInBytes" is likely too narrow given the new consumers
but... Also add "tebibyte" support to RAMInBytes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 2470a5ed999d9dc8d4b9bd250727ac13964db5b3
Component: engine
2014-06-24 12:10:14 -04:00
157a125d05
devmapper: fix reloadPool() to also specify '1 skip_block_zeroing'
...
createPool() and reloadPool() should be consistent with the thin-pool
table params they use.
Since createPool() specifies '1 skip_block_zeroing' reloadPool() should
too. Otherwise, if the pool is reloaded (as is done when resizing
loopback devices) block zeroing will be enabled after the reload
completes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: d420134fa2ea8ceedf2a9a64263d09b308263c2c
Component: engine
2014-06-24 11:23:13 -04:00
6a56f20a85
Merge pull request #6633 from SvenDowideit/avoid-extra-gravatar-download
...
Lets not download the gravatar and then download a different one after t...
Upstream-commit: f1ac8962f995d650ec10b04b055c8bbb0db4bec4
Component: engine
2014-06-23 23:58:15 -07:00
d6876fe608
Lets not download the gravatar and then download a different one after the js is triggered
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: c7a1bdf6c039c41877c007ab44902f084860ede0
Component: engine
2014-06-24 14:48:29 +10:00
04e0cbb118
Merge pull request #6624 from jezenielzapanta/patch-1
...
Fix typo in the docs.
Upstream-commit: 664ba0c0315770b6a6608ee308d46b4b8fb82e76
Component: engine
2014-06-23 19:20:20 -07:00
862532b635
Merge pull request #6623 from rogaha/fix_header_links
...
Fix header and About Docker links
Upstream-commit: 67ba305841e484d1e7c65affa0b0a7246722a990
Component: engine
2014-06-24 12:18:29 +10:00
6d58de7959
Merge pull request #4812 from kzys/freebsd-mount
...
FreeBSD support on pkg/mount
Upstream-commit: d7587aa97686b83b5ab30e342f95425a16480fcb
Component: engine
2014-06-23 17:45:25 -07:00
2e2569f2c6
Merge pull request #6620 from vieux/deprecate_tag_args
...
Remove old tag format
Upstream-commit: 6a762e859494eb73cbd92a41d5268a523996aa41
Component: engine
2014-06-23 17:24:20 -07:00
9fa35c03c4
Merge pull request #6599 from SvenDowideit/6478-update-fedora
...
Update fedora.md
Upstream-commit: 28c22cb7f97ea1d7601fea231944b0dd72899b48
Component: engine
2014-06-23 17:23:00 -07:00
6921f64968
Merge pull request #6617 from ifraixedes/patch-1
...
Update dockervolumes.md
Upstream-commit: b49cfaffa8d9f3dfdece90983e930b333d0cb561
Component: engine
2014-06-24 08:50:27 +10:00
783bf54c3c
Merge pull request #5715 from proppy/context-tar
...
allow docker build - to accept a context tar from stdin
Upstream-commit: 2d195fb6f87d68e716c7fa590796e83252418b15
Component: engine
2014-06-23 15:33:21 -07:00
278a5eebd6
Merge pull request #6539 from LK4D4/fix_large_frame_in_stdcopy
...
Fix stdcopy when reads large frame at once
Upstream-commit: 14ee02188537f3fbdb2b028e0a9f8e4852a1fad5
Component: engine
2014-06-23 13:52:30 -07:00
794a8c5ccb
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
2014-06-23 13:34:09 -07:00
480699f84b
Merge pull request #6621 from LK4D4/move_sorter_tests_to_integration_cli
...
Move sorter_test from integration to integration-cli
Upstream-commit: 3f600c831be720fac60ff8a78aa3e344a7423c4e
Component: engine
2014-06-23 13:17:37 -07:00
87588f265b
Fix typo in the docs.
...
Fix a minor typographical error inside `run.md`.
Upstream-commit: cf6834d797627208a9ec34326a85d594cdf1c918
Component: engine
2014-06-24 03:26:22 +08:00
df2d564502
Fix header and about Docker links
...
Upstream-commit: edf16383c60c8c05549a97a0fb909c2387f69bce
Component: engine
2014-06-23 18:35:15 +00:00
6f7299924f
Move sorter_test from integration to integration-cli
...
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 386d1ecc6e2489401aac685eb11da15d21c4b0a7
Component: engine
2014-06-23 22:19:52 +04:00
3557053e47
Merge pull request #6532 from jonboulle/fix_capitals
...
be consistent in capitalization of Docker
Upstream-commit: 62b2b1bac3f44adb1281e134ecaa8ebcd09ffaf6
Component: engine
2014-06-23 11:14:27 -07:00
82240e2b85
Remove old tag format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8228d0e2bbd3a42755a84e11455b51a5caf61a94
Component: engine
2014-06-23 17:52:03 +00:00
9f9b90d4c3
Merge pull request #6585 from kzys/runconfig-fatalf
...
Fatal() doesn't take a format string like Fatalf()
Upstream-commit: c32036fa9be9c6be4adcb18f7457f9c034851f83
Component: engine
2014-06-23 10:24:01 -07:00
b864ab9ae3
Merge pull request #6572 from tianon/better-debootstrap-self-documentation
...
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
Upstream-commit: 549e34b3d7889d658f7fd8ff2ac8fa3e96453e4c
Component: engine
2014-06-23 11:12:02 -06:00
ea235c6d42
Update dockervolumes.md
...
Missed double hyphen in `--volumes-from` option
Upstream-commit: 3ce5fde7ab86bb5307129b77fa09225ca07b1128
Component: engine
2014-06-23 16:08:34 +01:00
0da85d5bbc
Merge pull request #6536 from dgageot/patch-2
...
Fix flag names
Upstream-commit: fa8f89c5212f10932ebc5650853b356670b6f41a
Component: engine
2014-06-23 15:26:08 +10:00
ef84c42974
Merge pull request #6583 from jamtur01/sshd
...
Updated SSH example to ensure it continues working
Upstream-commit: 10b8d6b8b0847bca8630238deddc42237a31309c
Component: engine
2014-06-23 01:17:35 -04:00
a2aec8075b
Merge pull request #6611 from SvenDowideit/remove-spurious-dollar-signs
...
Remove `$` leaders from examples of editing text in a file
Upstream-commit: 09e694aa7dd0780b503116172f10f7a60eb7cd38
Component: engine
2014-06-23 01:13:42 -04:00
6e5314fd43
Remove $ leaders from examples of editing text in a file
...
not everything that is indented is a commandline example
Closes #6591
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4d7e28a7d701c3c3ee331f2d6f4fce62fdd20d93
Component: engine
2014-06-23 14:50:11 +10:00
db1600d730
Update fedora.md
...
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: alshopov)
Squashed by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
replaces #6478
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: )
Upstream-commit: 9559f57463f8cd4c1af726514ae744a646fdd462
Component: engine
2014-06-22 19:39:45 -07:00
4f739a98e3
Merge pull request #6581 from fredlf/copyedit_dockerrepo
...
Revised and fixed links on dockerrepo.md
Upstream-commit: ad19e5e1330f6c0155b3cf35313c4c1529f0fb45
Component: engine
2014-06-22 22:17:40 -04:00
115fbc39bb
Merge pull request #6426 from tianon/fix-import-man-error
...
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
Upstream-commit: 875b0698e8d45bf1c6cadbc56b7fd208c303ca5d
Component: engine
2014-06-23 11:48:35 +10:00
d4034f1b30
Merge pull request #6605 from SvenDowideit/6423-remove-b2d-ssh-passphrase-prompt
...
Remove mention of SSH passphrase, it was only present in v0.12
Upstream-commit: 22cf1586cfd7c72a36a5988fdf29796c599469bf
Component: engine
2014-06-22 20:54:22 -04:00
e953c57f78
Remove mention of SSH passphrase, it was only present in v0.12
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1e847bff7af8ae722318cc7d448f46be955496c3
Component: engine
2014-06-22 17:36:02 -07:00
149a6ca8ec
Merge pull request #6598 from SvenDowideit/6394-missing-redirect
...
one last missing docs redirect
Upstream-commit: e876067e3457b24fb16146723cd8c21062c34d1c
Component: engine
2014-06-22 19:06:27 -04:00
4d246d84ff
one last missing redirect
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 51d032737c812347c766bf7a3df43c18ec708b9e
Component: engine
2014-06-22 16:01:21 -07:00
0759f90ae4
Fatal() doesn't take a format string like Fatalf()
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 00469957ad0e17adf60a486740f4132a503e7309
Component: engine
2014-06-21 17:32:39 +09:00
f7a2f6b059
Fixed a typo
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: ab0fc77ebe73e0dededad1d47dc3788191cb966c
Component: engine
2014-06-20 17:52:30 -07:00
03cfca710a
Revised and fixed links on dockerrepo.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c70fbae3ed44090fffc9e5b81d2a6410e6008fcc
Component: engine
2014-06-20 17:10:20 -07:00
914d4d5405
Merge pull request #6578 from ch3pjw/documentation_fix
...
Fix minor typo and improve wording
Upstream-commit: ad19f1beb74cb06c46f4ba424a6a80594f0b6ed6
Component: engine
2014-06-21 09:57:25 +10:00
8a5bd0e9d1
Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
...
Disable netgo for dynbinary builds
Upstream-commit: 506ad22743a233b168fb0053e39e9c5dd1ec92ce
Component: engine
2014-06-20 17:51:12 -06:00
bb5e064589
Merge pull request #6529 from qwazerty/master
...
Fix minor typo
Upstream-commit: d6f7725e58d42763ac228ad65a7c1e285d8e422f
Component: engine
2014-06-20 17:37:07 -04:00
ac51920bca
Clean up some uses on 'an' in builder docs
...
Upstream-commit: 5266d6fa7bc367ac4c7472550b7220c4eb06731f
Component: engine
2014-06-20 22:36:31 +01:00
6884fb8621
Fix minor typo and improve wording
...
Upstream-commit: 1bcc37caec07c01ab385f562ffa56d2b2bb0a7d8
Component: engine
2014-06-20 22:21:18 +01:00
ca9f863c20
be consistent in capitalization of Docker
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com > (github: jonboulle)
Upstream-commit: 6d14e9f1acc3d5927cbd4f4b3c7ea0c691dea7bc
Component: engine
2014-06-20 14:05:46 -07:00
929a82a086
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
23fd1b998a
Merge pull request #6516 from LK4D4/validate_logs_params
...
Validate that one of streams choosen in logs on api side
Upstream-commit: 8ee1f2a9e9dc1ef025b1551f1f5b676116c83cfa
Component: engine
2014-06-20 13:43:31 -07:00
c6816e3f6c
Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
...
More verbose error for parallel pull
Upstream-commit: 189967a12ae6a7be994238054086b23115d25548
Component: engine
2014-06-20 13:29:51 -07:00
dcfc8d37e9
docker save: raw json
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: d3bc787bca62edff384e06a12224be2d982353da
Component: engine
2014-06-20 14:38:17 -04:00
414df5ef2f
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
...
This also adds support for squeeze-lts. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a206186f8427c74fbf9625e4140bf84461a67eec
Component: engine
2014-06-20 10:11:26 -06:00
fcdeff83df
Merge pull request #6565 from shaunol/patch-1
...
Update windows.md
Upstream-commit: b2eb79b7dad44fcbfac31565bec3763bb7ec796c
Component: engine
2014-06-20 23:27:12 +10:00
