toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,265 Commits 3 Branches 295 Tags
c77458bef612cec6ea39edd117ba4a4e25972d3a
Commit Graph
12265 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 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
Ivan Fraixedes ea235c6d42 Update dockervolumes.md 
Missed double hyphen in `--volumes-from` option
Upstream-commit: 3ce5fde7ab86bb5307129b77fa09225ca07b1128
Component: engine
 2014-06-23 16:08:34 +01:00
Sven Dowideit 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
James Turnbull 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
James Turnbull 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
SvenDowideit 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
Alexander Shopov 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
James Turnbull 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
Sven Dowideit 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
James Turnbull 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
Sven Dowideit 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
James Turnbull 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
Sven Dowideit 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
Robert Bachmann b83a4a02c5 Windows needs hardware virtualization 
VirtualBox needs hardware virtualization for
64-bit guests.

Docker-DCO-1.1-Signed-off-by: Robert Bachmann <rb@robertbachmann.at> (github: robertbachmann)
Upstream-commit: ba7245f07271d5ccba70ef659b3e88424cf36887
Component: engine
 2014-06-21 23:14:23 +02:00
Kato Kazuyoshi 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
Fred Lifton 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
Fred Lifton 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
Sven Dowideit 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
Tianon Gravi 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
Tibor Vass bb5e064589 Merge pull request #6529 from qwazerty/master 
Fix minor typo
Upstream-commit: d6f7725e58d42763ac228ad65a7c1e285d8e422f
Component: engine
 2014-06-20 17:37:07 -04:00
Paul Weaver ac51920bca Clean up some uses on 'an' in builder docs 
Upstream-commit: 5266d6fa7bc367ac4c7472550b7220c4eb06731f
Component: engine
 2014-06-20 22:36:31 +01:00
Paul Weaver 6884fb8621 Fix minor typo and improve wording 
Upstream-commit: 1bcc37caec07c01ab385f562ffa56d2b2bb0a7d8
Component: engine
 2014-06-20 22:21:18 +01:00
Jonathan Boulle 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
unclejack 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
Michael Crosby 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
Michael Crosby 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
Vincent Batts 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
Matthew Heon 3ee2658a4c Escape control and nonprintable characters in docker ps 
The docker ps command displays the user-entered command running in a container.
If that command contained \n, \t, or other control characters, they were
interpreted literally, and newlines and tabs would be printed in the output.
Escape the command string to make things more readable.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: f55fa8211b6faf08091dd99ed8e5e3f08ab9cf1f
Component: engine
 2014-06-20 12:22:31 -04:00
Tianon Gravi 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
Brian Goff 2ad31b8e2f Add cpuguy83 as volumes maintainer 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: ff1ea0064b49bd1d72cafe5d02be9eab4d54b683
Component: engine
 2014-06-20 09:40:29 -04:00
Sven Dowideit 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
Sven Dowideit 8b9e10c4f9 Merge pull request #6568 from jokajak/patch-2 
Minor typo/format fixes for dockerlinks.md
Upstream-commit: ed833bb62d63ae037a91d38df617def548f3737a
Component: engine
 2014-06-20 23:23:03 +10:00
James Turnbull 1d18ac109a Merge pull request #6540 from lalyos/docs-installation-mac-windows 
Fix installation docs to use the new boot2docker command: ip
Upstream-commit: 0d63d68e33d0c74985482aafdd8a3c3c2f757efb
Component: engine
 2014-06-20 08:02:56 -05:00
James Turnbull b6eb05620c Merge pull request #6566 from jokajak/patch-1 
Fix typo in networking.md
Upstream-commit: a32f3b4b50820d5d04b10948dab3dc9a13f01ae1
Component: engine
 2014-06-20 07:59:35 -05:00
Josh e3cc01df51 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_'
Upstream-commit: 66bccf3064effd910e47405dc738ba08a8d14b12
Component: engine
 2014-06-20 07:49:22 -04:00
Sven Dowideit fc6c3567e1 Merge pull request #6564 from financeCoding/docs-installation-google-fix 
full url to GCE image
Upstream-commit: c60cde14990a4d3b502af19895e2c8bbabd0f9ba
Component: engine
 2014-06-20 21:41:35 +10:00
Josh 4982ce8f2c Fix typo in networking.md 
Minor typo fix
Upstream-commit: cbdce9912d9f904b237e29dd2a1196367337628b
Component: engine
 2014-06-20 07:14:56 -04:00
shaunol c160f0471c Update windows.md 
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
Upstream-commit: db9bf744ab93f1e688bf986794c852abc40b873e
Component: engine
 2014-06-20 19:23:35 +12:00
Adam Singer 64dc347e88 full url to GCE image 
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 4efe02b3df67af544d398e435fbe567502bf0dea
Component: engine
 2014-06-19 22:01:10 -07:00
James Turnbull 7c71f92cb5 Merge pull request #6548 from jamtur01/sec 
Fixed #6545 - Updated Security article
Upstream-commit: 4e286a9094dc52a5dd709fd11787c8fb6b6fe38d
Component: engine
 2014-06-19 20:21:07 -05:00
Victor Vieux 7fabfe41f5 Merge pull request #6563 from vieux/merge_release_v1.0.1 
Merge release v1.0.1
Upstream-commit: 8554841c6a614a894bbe708e724d50b4a8f0a86b
Component: engine
 2014-06-19 18:09:07 -07:00
Victor Vieux 9f5b3a4e1b Change version to 1.0.1-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 49376ec4483c241167f7623ccc0260486ce8d4a3
Component: engine
 2014-06-20 01:06:48 +00:00
Victor Vieux 10cd020262 Merge pull request #6559 from vieux/bump_v1.0.1 
Bump v1.0.1
Upstream-commit: 7030cdce59f5ae50220ea72c26a7f8b6a125c0ca
Component: engine
 2014-06-19 18:03:54 -07:00
Victor Vieux 8e533cce58 Bump version to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 990021ac2b4a4c8e6ae66dd331c372f70eec3b7a
Component: engine
 2014-06-19 23:11:34 +00:00
Victor Vieux 3be2fcd18e Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1 
Update libcontainer dep to v1.0.1
Upstream-commit: 41d405fa5387b0c0a84aea0a41a5ce84e1dd5231
Component: engine
 2014-06-19 15:43:30 -07:00
Michael Crosby beca1cc741 Update libcontainer dep to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 8d06bfc12ec62b8276b2db22e049d40dde016c9f
Component: engine
 2014-06-19 15:23:19 -07:00
Tianon Gravi 9254e8e818 Merge pull request #6554 from tianon/fix-dyntest 
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
Upstream-commit: 98ea12ac3864239127ae3a9d2aa2d93a72aa5e61
Component: engine
 2014-06-19 16:04:24 -06:00
Victor Vieux cd49e29a76 Merge pull request #6527 from subhraveti/cap-whitelist 
Maintain a whitelist of capabilities rather than droplist
Upstream-commit: 7ba8788919bf6ddb5de626f3b1b89c497eed4b86
Component: engine
 2014-06-19 14:48:38 -07:00
James Turnbull af26e461d3 Fixed #6545 - Updated Security article 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: bf69b773ec4c817dcc276e4471fc85f762f18f9f
Component: engine
 2014-06-19 16:13:20 -05:00
Tianon Gravi d1de6bfa90 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)
Upstream-commit: 986a151b8afe59b33097235a5964f78fc1a55521
Component: engine
 2014-06-19 15:06:34 -06:00