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
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
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
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
shaunol
db9bf744ab
Update windows.md
...
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
2014-06-20 19:23:35 +12:00
Adam Singer
4efe02b3df
full url to GCE image
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
2014-06-19 22:01:10 -07:00
James Turnbull
4e286a9094
Merge pull request #6548 from jamtur01/sec
...
Fixed #6545 - Updated Security article
2014-06-19 20:21:07 -05:00
Victor Vieux
8554841c6a
Merge pull request #6563 from vieux/merge_release_v1.0.1
...
Merge release v1.0.1
2014-06-19 18:09:07 -07:00
Victor Vieux
49376ec448
Change version to 1.0.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-20 01:06:48 +00:00
Victor Vieux
7030cdce59
Merge pull request #6559 from vieux/bump_v1.0.1
...
Bump v1.0.1
2014-06-19 18:03:54 -07:00
Victor Vieux
990021ac2b
Bump version to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-19 23:11:34 +00:00
Victor Vieux
41d405fa53
Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1
...
Update libcontainer dep to v1.0.1
2014-06-19 15:43:30 -07:00
Michael Crosby
8d06bfc12e
Update libcontainer dep to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-19 15:23:19 -07:00
Tianon Gravi
98ea12ac38
Merge pull request #6554 from tianon/fix-dyntest
...
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
2014-06-19 16:04:24 -06:00
Victor Vieux
7ba8788919
Merge pull request #6527 from subhraveti/cap-whitelist
...
Maintain a whitelist of capabilities rather than droplist
2014-06-19 14:48:38 -07:00
James Turnbull
bf69b773ec
Fixed #6545 - Updated Security article
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-19 16:13:20 -05:00
Tianon Gravi
986a151b8a
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 15:06:34 -06:00
Michael Crosby
abda245ddc
Merge pull request #6493 from vieux/fix_cp_mac_os
...
allow utimes on mac os, only lutimes isn't supported
2014-06-19 14:00:59 -07:00
Tibor Vass
4ad5af81c8
Merge pull request #6552 from vbatts/vbatts-gh6551
...
sqlite-3.6.20-1 unique constraint message
2014-06-19 16:54:43 -04:00
Tianon Gravi
3f7909e996
Disable netgo for dynbinary builds
...
It's not necessary to use the netgo implementation for non-static builds. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 14:35:30 -06:00
Michael Crosby
707ef9618b
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-19 16:02:21 -04:00