18efee874d
Remove viewport tag to fix iPhone scaling
...
Upstream-commit: 7b1dd54d5d29b5d15e2081cc21b836a1907162cf
Component: engine
2014-06-24 15:16:40 -07:00
a65bf57706
Merge pull request #6654 from vieux/fix_test_search
...
Fix search integration-cli test
Upstream-commit: 4f5e91e3b4fdbd29947ac9543f0352545b457e02
Component: engine
2014-06-24 17:51:07 -04:00
909b3a8ba8
Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
...
move the man pages to the docs/ dir
Upstream-commit: 11ef08402a5b8d39b1ec3fe004aa1d4b4c0ca5b3
Component: engine
2014-06-25 07:50:09 +10:00
06a813f16e
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
Upstream-commit: 6d8e95557cd63b6e8302255d6e070f24d7c2e6d5
Component: engine
2014-06-24 14:29:18 -07:00
d6e6af197e
Fix search integration-cli test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dd258553b1cbe58d0cb4f8d505aea6f3b1ae6543
Component: engine
2014-06-24 21:16:34 +00:00
3d6c57f495
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
Upstream-commit: 408963ed4d4ea5ffca99c08b3e22bf720eb19b88
Component: engine
2014-06-24 13:51:04 -07:00
7c1e43e819
Merge pull request #6595 from LK4D4/env_benchmarks
...
Benchmarks for engine/env
Upstream-commit: 1059e166fd4fbe88a05f182139b6fc5fc95ab6b3
Component: engine
2014-06-24 23:35:00 +03:00
df9f902ba5
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
Upstream-commit: c4dbd4f7c0ff3f33705db21a709c3475ebe0770b
Component: engine
2014-06-24 22:10:33 +03:00
126ec1c58c
Merge pull request #6216 from gsalgado/convert-integration-tests
...
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
Upstream-commit: f6d11c8d50387472fd7e34eea66b79237238c321
Component: engine
2014-06-24 14:53:10 -04:00
0daa61f085
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 1dc8e2ffab795f4999a122b4a576d54e03c7c61a
Component: engine
2014-06-24 11:31:03 -07:00
d4e9300e80
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: cee6f4506c79c6fc21769d427ac4dd51c28450c3
Component: engine
2014-06-24 11:31:03 -07:00
060053e75d
Update libcontainer to 5210a236b92a8022a673108f347
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 423a8f91d72f5def754ec3a8efe000aa70bc6f22
Component: engine
2014-06-24 11:30:36 -07:00
a93d5dc92d
Benchmarks for engine/env
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 01b424028ed0ab7d673c7ae2221457ae12304557
Component: engine
2014-06-24 21:48:16 +04:00
c72045b105
Improve truncindex benchmarks
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 7eb425ccd167487b8424ff680e46216d99fa237a
Component: engine
2014-06-24 21:41:51 +04:00
ae52a1306d
Merge pull request #5413 from SvenDowideit/docker-info-list-sockets
...
Add Sockets (-H) list to `docker -D info`.
Upstream-commit: e23e3a1600e1b9178771557a843ed6e0c979f78c
Component: engine
2014-06-24 10:40:53 -07:00
1ce22444ec
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ed032ddfd68a8654671a13d676c0f7539e36a10b
Component: engine
2014-06-24 21:19:15 +04:00
403b31a70b
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
2014-06-24 17:43:26 +02:00
7622154038
cp's -T and --reflink=auto are only available on GNU coreutils
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 733711481ee665564f0f2a77d100353d5f9c82e2
Component: engine
2014-06-24 23:58:17 +09: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
b873d0d1bc
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 42be6f2957c945e070079ec773e29b356a9f9452
Component: engine
2014-06-24 13:07:42 +10:00
4369605adb
move api docs to APIv1.13
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cf513185b0803ac02bbd8cef05e3372e7fc3b269
Component: engine
2014-06-24 12:25:18 +10:00
90c80009e3
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +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
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
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
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
