Граф коммитов

9119 Коммитов

Автор SHA1 Сообщение Дата
James Turnbull 664ba0c031 Merge pull request #6624 from jezenielzapanta/patch-1
Fix typo in the docs.
2014-06-23 19:20:20 -07:00
Sven Dowideit 67ba305841 Merge pull request #6623 from rogaha/fix_header_links
Fix header and About Docker links
2014-06-24 12:18:29 +10:00
Victor Vieux d7587aa976 Merge pull request #4812 from kzys/freebsd-mount
FreeBSD support on pkg/mount
2014-06-23 17:45:25 -07:00
Victor Vieux 6a762e8594 Merge pull request #6620 from vieux/deprecate_tag_args
Remove old tag format
2014-06-23 17:24:20 -07:00
James Turnbull 28c22cb7f9 Merge pull request #6599 from SvenDowideit/6478-update-fedora
Update fedora.md
2014-06-23 17:23:00 -07:00
Sven Dowideit b49cfaffa8 Merge pull request #6617 from ifraixedes/patch-1
Update dockervolumes.md
2014-06-24 08:50:27 +10:00
Victor Vieux 2d195fb6f8 Merge pull request #5715 from proppy/context-tar
allow docker build - to accept a context tar from stdin
2014-06-23 15:33:21 -07:00
Victor Vieux 14ee021885 Merge pull request #6539 from LK4D4/fix_large_frame_in_stdcopy
Fix stdcopy when reads large frame at once
2014-06-23 13:52:30 -07:00
Johan Euphrosine edcb41451a api/client/build: allow tar as context for docker build -
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-06-23 13:34:09 -07:00
Michael Crosby 3f600c831b Merge pull request #6621 from LK4D4/move_sorter_tests_to_integration_cli
Move sorter_test from integration to integration-cli
2014-06-23 13:17:37 -07:00
Jezeniel Zapanta cf6834d797 Fix typo in the docs.
Fix a minor typographical error inside `run.md`.
2014-06-24 03:26:22 +08:00
Roberto G. Hashioka edf16383c6 Fix header and about Docker links 2014-06-23 18:35:15 +00:00
LK4D4 386d1ecc6e 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)
2014-06-23 22:19:52 +04:00
Victor Vieux 62b2b1bac3 Merge pull request #6532 from jonboulle/fix_capitals
be consistent in capitalization of Docker
2014-06-23 11:14:27 -07:00
Victor Vieux 8228d0e2bb Remove old tag format
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-23 17:52:03 +00:00
Victor Vieux c32036fa9b Merge pull request #6585 from kzys/runconfig-fatalf
Fatal() doesn't take a format string like Fatalf()
2014-06-23 10:24:01 -07:00
Tianon Gravi 549e34b3d7 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
2014-06-23 11:12:02 -06:00
Ivan Fraixedes 3ce5fde7ab Update dockervolumes.md
Missed double hyphen in `--volumes-from` option
2014-06-23 16:08:34 +01:00
Sven Dowideit fa8f89c521 Merge pull request #6536 from dgageot/patch-2
Fix flag names
2014-06-23 15:26:08 +10:00
James Turnbull 10b8d6b8b0 Merge pull request #6583 from jamtur01/sshd
Updated SSH example to ensure it continues working
2014-06-23 01:17:35 -04:00
James Turnbull 09e694aa7d Merge pull request #6611 from SvenDowideit/remove-spurious-dollar-signs
Remove `$` leaders from examples of editing text in a file
2014-06-23 01:13:42 -04:00
SvenDowideit 4d7e28a7d7 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)
2014-06-23 14:50:11 +10:00
Alexander Shopov 9559f57463 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: )
2014-06-22 19:39:45 -07:00
James Turnbull ad19e5e133 Merge pull request #6581 from fredlf/copyedit_dockerrepo
Revised and fixed links on dockerrepo.md
2014-06-22 22:17:40 -04:00
Sven Dowideit 875b0698e8 Merge pull request #6426 from tianon/fix-import-man-error
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
2014-06-23 11:48:35 +10:00
James Turnbull 22cf1586cf Merge pull request #6605 from SvenDowideit/6423-remove-b2d-ssh-passphrase-prompt
Remove mention of SSH passphrase, it was only present in v0.12
2014-06-22 20:54:22 -04:00
Sven Dowideit 1e847bff7a 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)
2014-06-22 17:36:02 -07:00
James Turnbull e876067e34 Merge pull request #6598 from SvenDowideit/6394-missing-redirect
one last missing docs redirect
2014-06-22 19:06:27 -04:00
Sven Dowideit 51d032737c one last missing redirect
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-06-22 16:01:21 -07:00
Kato Kazuyoshi 00469957ad Fatal() doesn't take a format string like Fatalf()
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-06-21 17:32:39 +09:00
Fred Lifton ab0fc77ebe Fixed a typo
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-06-20 17:52:30 -07:00
Fred Lifton c70fbae3ed Revised and fixed links on dockerrepo.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-06-20 17:10:20 -07:00
Sven Dowideit ad19f1beb7 Merge pull request #6578 from ch3pjw/documentation_fix
Fix minor typo and improve wording
2014-06-21 09:57:25 +10:00
Tianon Gravi 506ad22743 Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
Disable netgo for dynbinary builds
2014-06-20 17:51:12 -06:00
Tibor Vass d6f7725e58 Merge pull request #6529 from qwazerty/master
Fix minor typo
2014-06-20 17:37:07 -04:00
Paul Weaver 5266d6fa7b Clean up some uses on 'an' in builder docs 2014-06-20 22:36:31 +01:00
Paul Weaver 1bcc37caec Fix minor typo and improve wording 2014-06-20 22:21:18 +01:00
Jonathan Boulle 6d14e9f1ac be consistent in capitalization of Docker
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
2014-06-20 14:05:46 -07:00
unclejack a5f5d5e8d7 Merge pull request #6571 from vbatts/vbatts-raw_json
raw json for `docker save`
2014-06-20 23:55:10 +03:00
Michael Crosby 8ee1f2a9e9 Merge pull request #6516 from LK4D4/validate_logs_params
Validate that one of streams choosen in logs on api side
2014-06-20 13:43:31 -07:00
Michael Crosby 189967a12a Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
More verbose error for parallel pull
2014-06-20 13:29:51 -07:00
Vincent Batts d3bc787bca docker save: raw json
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-06-20 14:38:17 -04:00
Tianon Gravi a206186f84 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)
2014-06-20 10:11:26 -06:00
Sven Dowideit b2eb79b7da Merge pull request #6565 from shaunol/patch-1
Update windows.md
2014-06-20 23:27:12 +10:00
Sven Dowideit ed833bb62d Merge pull request #6568 from jokajak/patch-2
Minor typo/format fixes for dockerlinks.md
2014-06-20 23:23:03 +10:00
James Turnbull 0d63d68e33 Merge pull request #6540 from lalyos/docs-installation-mac-windows
Fix installation docs to use the new boot2docker command: ip
2014-06-20 08:02:56 -05:00
James Turnbull a32f3b4b50 Merge pull request #6566 from jokajak/patch-1
Fix typo in networking.md
2014-06-20 07:59:35 -05:00
Josh 66bccf3064 Minor typo/format fixes
This fixes a code block typo so it renders as a code block.  Additionally synchronizes the variable prefix examples from 'DB' and 'DB1_' to 'DB_' and 'DB1_'
2014-06-20 07:49:22 -04:00
Sven Dowideit c60cde1499 Merge pull request #6564 from financeCoding/docs-installation-google-fix
full url to GCE image
2014-06-20 21:41:35 +10:00
Josh cbdce9912d Fix typo in networking.md
Minor typo fix
2014-06-20 07:14:56 -04:00