toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,201 Commits 3 Branches 295 Tags
b82d2b880101df55a808119e45fe22787fae1dce
Commit Graph
4201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz f37e981fe7 Merge pull request #2757 from Painted-Fox/patch-2 
Simplify the upstart example in host_integration.rst
Upstream-commit: 4eaba8de918c384a782f181122c333fa7bd14857
Component: engine
 2013-11-19 10:29:54 -08:00
Andy Rothfusz 7d3676e536 Merge pull request #2770 from tianon/better-man-page 
Switch sphinx man_pages generation to use commandline/cli
Upstream-commit: 434c1613a42661014147c21fe22867f6faa0a901
Component: engine
 2013-11-19 10:28:50 -08:00
Andy Rothfusz 2d625fbded Merge pull request #2766 from sbellem/doc-improvements 
fixed typos, and made small improvements to the wording
Upstream-commit: 18da26c62a2b4dc749a9c4074efcca32cc4b0573
Component: engine
 2013-11-19 10:27:25 -08:00
Vitor Monteiro e6a444ec3b Change to documentation for AWS AMI request 
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.

I just though some people might have the same issue.

Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.

Cheers.
Upstream-commit: aeb304b37c190e7fab60c0db946d1fd5d8e9e9f3
Component: engine
 2013-11-19 17:50:38 +00:00
Ryan Seto 8dfcb6d8f5 Fix quote mistake. 
Upstream-commit: 1da8c50deddde692c1f87aec86c20cd3c2c3fd11
Component: engine
 2013-11-19 12:14:39 -05:00
Tianon Gravi a9304e452b Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page 
Upstream-commit: 1cd9529ad350f70aaf6627368bdc8d007b90b3e4
Component: engine
 2013-11-19 10:10:42 -07:00
Daniel Mizyrycki b456131081 Merge pull request #2734 from zitrusmedia/master 
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
Upstream-commit: f78d45863cb285e45edd427a958962421d3832f2
Component: engine
 2013-11-19 09:04:28 -08:00
Sylvain Bellemare 3ec0757555 fixed typos, and made small improvements to the wording 
Upstream-commit: 3656db66d2f13d74e07574d229b32023bb11dc1f
Component: engine
 2013-11-19 14:44:50 +01:00
unclejack fa7c88b484 fix container size computation: handle hard links 
This change makes docker compute container size correctly.

The old code isn't taking hard links into account. Containers could
seem like they're up to 1-1.5x larger than they really were.
Upstream-commit: 78c843c8eff64da5e12725bdb111b18e51d82606
Component: engine
 2013-11-19 13:53:34 +02:00
unclejack e1cbb6a909 fix layer size computation: handle hard links 
This change makes docker compute layer size correctly.

The old code isn't taking hard links into account. Layers could
seem like they're up to 1-1.5x larger than they really were.
Upstream-commit: ac821f2446628a9151587038f1d377f57985a452
Component: engine
 2013-11-19 13:37:54 +02:00
Victor Vieux 3768669ba5 Do ont truncate ID on docker rmi 
Upstream-commit: 2fe4467d73b1bfe4a64011ee9d6b6aaf8b244fa5
Component: engine
 2013-11-18 18:39:02 -08:00
Ryan Seto e445caadb0 Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out. 
Upstream-commit: 194d4b93768c49f0d76a5da8943446efbea879ca
Component: engine
 2013-11-18 21:23:00 -05:00
Andy Rothfusz d87c69acdb Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to-mount 
Fixes #2702. Also cleans up formatting and long lines in volumes doc.
Upstream-commit: 1de02a70dea3249413da4a06a205d7d9c98145aa
Component: engine
 2013-11-18 17:27:49 -08:00
Guillaume J. Charmes 6e0c243c2e Lintify code with confidence=1 
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
 2013-11-18 16:24:11 -08:00
Andy Rothfusz f783d46575 Merge pull request #2755 from metalivedev/test-2592 
Replace PR#2592
Upstream-commit: 511a62a099ee086b6472816703a3e247d42f2127
Component: engine
 2013-11-18 15:29:48 -08:00
Andy Rothfusz 2b588f2557 Merge pull request #2721 from metalivedev/2701-addmedia 
Add security section and embed private registry video.
Upstream-commit: 256d46fe68e0faaab8efc3101ece2260a009e2af
Component: engine
 2013-11-18 15:29:35 -08:00
Ryan Seto 5a2e995ad5 Simplify the upstart example in host_integration.rst 
Taking some pointers from @tianon on my pull request #2685.
Upstream-commit: 76ee860ece15f8a7738c503fdd73f124f0ef1f4b
Component: engine
 2013-11-18 16:21:03 -05:00
Andy Rothfusz 814f2e1b4e Fixes #2702. Also cleans up formatting and long lines in volumes doc. 
Upstream-commit: 2ae1f29dfe6fea26d2e0ac29faa2375a5db2c2d9
Component: engine
 2013-11-18 13:09:13 -08:00
Josh Poimboeuf c4cad6571f test: remove extra args in TestExitCode 
The extra blank argument isn't needed and confuses libvirt.
Upstream-commit: 4b80ec9aae2f43e831de64f3746c7838252e9203
Component: engine
 2013-11-18 15:07:11 -06:00
Josh Poimboeuf ef3400502c test: fix TestRmi race condition 
Upstream-commit: fef41ef7bf83ed04c7df8e0247e60c0d495eefdc
Component: engine
 2013-11-18 15:07:06 -06:00
Victor Vieux 9af9f8999c Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup 
Fix tmp dir never cleanup
Upstream-commit: f946a486ea3cdb56c771a37da281ad223b5042f8
Component: engine
 2013-11-18 12:20:23 -08:00
Guillaume J. Charmes 3aad2aef64 Merge pull request #2743 from tianon/go1.2rc5 
Update to go1.2rc5
Upstream-commit: e008c7c0685ea43861b61a6e5e4509516707e967
Component: engine
 2013-11-18 12:11:56 -08:00
Andy Rothfusz 29163ad063 Merge pull request #2729 from SvenDowideit/docker-info-doc 
add example for docker info
Upstream-commit: 669e4bac30f41c2bebbcae2889fb1420cd41af37
Component: engine
 2013-11-18 11:44:54 -08:00
Andy Rothfusz 28e01f39d4 Merge pull request #2726 from SvenDowideit/docker-history-doc 
add example for docker history
Upstream-commit: f6362fbb0ee00aa2a7ac6ca21f8ba1004a135b4c
Component: engine
 2013-11-18 11:43:44 -08:00
Andy Rothfusz 0af8e75a2b Merge pull request #2742 from rick/patch-1 
Tiny typo cleanup
Upstream-commit: c1cd8245709da81e5633145a8e6991eee336c555
Component: engine
 2013-11-18 11:37:37 -08:00
Michael Crosby 00d1972d8e Merge pull request #2752 from dotcloud/gofmt_test 
Go fmt tests
Upstream-commit: 4546832507694fc675fe1604b219de25d454cd35
Component: engine
 2013-11-18 11:34:59 -08:00
Andy Rothfusz ab58212aa6 Merge pull request #2724 from SvenDowideit/docker-diff-example 
add an example of what to expect from docker diff, and what the 3 codes mean
Upstream-commit: b5934711d06331d911447d87146ec539da397a77
Component: engine
 2013-11-18 11:34:05 -08:00
Victor Vieux e0cb0011ff gofmt_test 
Upstream-commit: ed8f75d25ca0fb46d8c06bfe74bbc386bf4e8a8f
Component: engine
 2013-11-18 11:25:13 -08:00
Michael Crosby 73f468d678 Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD 
Do not forward SIGCHLD to container
Upstream-commit: cfbd9ea16dd9ef421f7d6f7d1ed325c7d070eeb3
Component: engine
 2013-11-18 11:24:08 -08:00
Michael Crosby 09ea066621 Merge pull request #2638 from FreakyDazio/2506-name-conflict-error 
More informative error message on name collisions
Upstream-commit: 75dd1663e0be37fc7a29ae3eaf55a27f7f1b2d9d
Component: engine
 2013-11-18 11:13:43 -08:00
Darren Coxall 6c91c91066 More informative error message on name collisions 
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
 2013-11-18 17:51:47 +00:00
Josh Poimboeuf 4070c845dc don't forward SIGCHLD to container 
It makes no sense to forward SIGCHLD to the container.
Upstream-commit: 440422a96346072a0a9016c4db78ff7599a702aa
Component: engine
 2013-11-18 11:45:29 -06:00
Josh Poimboeuf 4d58ddf15b fix container restart race condition 
Finish container cleanup before setting the state to stopped.
Otherwise, for an application that exits quickly, a call to Restart
can allow Start to be called again before cleanup is done, resulting in
overritten data in the Container struct.
Upstream-commit: fc2f5758cf22fe5d3d46be7e4642abc0735e2c8d
Component: engine
 2013-11-18 11:42:30 -06:00
Josh Poimboeuf 0c60a3c3a0 test: 2 second timeout (not 2000) 
Upstream-commit: fe302fbfd26fc7db5d751d4bec8a0bd4ce6030a4
Component: engine
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf b0f8db9d1b test: skip TestCreate on Fedora due to lxc utils bug 
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
Upstream-commit: 72d02ecdde2ba6f39739a0a942f2c4a057b4d45f
Component: engine
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf 4527e73586 test: fix TestCreateStartRestartStopStartKillRm 
cat needs stdin opened, otherwise it dies immediately.
Upstream-commit: baa687bed2f1f9ee6e44c70d95baad8757ac529c
Component: engine
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf ed492661bb test: put each arg in a separate string 
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
Upstream-commit: 30ea0bebce340dfc257b5b45835234cb921f3a48
Component: engine
 2013-11-18 10:23:06 -06:00
Tianon Gravi 6f7d08bf45 Update to go1.2rc5 
Upstream-commit: 9e1da3ec9ce8e608c17d999446882ae096b8394f
Component: engine
 2013-11-17 22:36:26 -07:00
Rick Bradley 92d82345a3 Tiny typo cleanup 
Upstream-commit: b76574f85512d3566bd056d516084e777788a82c
Component: engine
 2013-11-17 21:10:06 -08:00
Tianon Gravi 9f3980c29f Merge pull request #2732 from jplock/patch-2 
Fix images not being properly tagged in mkimage-debootstrap.sh
Upstream-commit: 457375ea370a2da0df301d35b1aaa8f5964dabfe
Component: engine
 2013-11-17 08:06:58 -08:00
Frederik Loeffert 002c9db825 Vagrantfile modified to support VBoxGuestAdditions_4.3.2 
Upstream-commit: 7e580aacec10d64c2fa0811e41a35159e47fcfa4
Component: engine
 2013-11-17 01:20:21 +01:00
Justin Plock 58c14de9fd Fix images not being properly tagged 
Upstream-commit: 0e64b987e8cbbd6944bd0594f8173f959867f4fc
Component: engine
 2013-11-16 11:05:38 -05:00
Sven Dowideit a69dc14f58 make the docker commit help more copy&pasteable 
Upstream-commit: bc74f65068b6b80b657e07f4ab2d7b115aacae75
Component: engine
 2013-11-16 21:11:34 +10:00
Sven Dowideit dbb96cce3d add example 
Upstream-commit: 5c741ef11db8777bc7723d879624ae8281121c18
Component: engine
 2013-11-16 20:53:45 +10:00
Sven Dowideit dbd9984b5b add some common examples for docker images, and tell the user what -a filters out 
Upstream-commit: 152459b7272daa30ab5207b512f5319fdc4ff491
Component: engine
 2013-11-16 20:45:30 +10:00
Sven Dowideit b3d92f6b0f add example for docker history 
Upstream-commit: f04142c1f765b4d1afb8eb388f3ca9466c22abf7
Component: engine
 2013-11-16 20:36:33 +10:00
Sven Dowideit 83c673a90c add an example of what to expect from docker diff, and what the 3 codes mean 
Upstream-commit: af05ab399e17c97bdea4b3ee893c47f29c0e22a5
Component: engine
 2013-11-16 20:26:47 +10:00
Sven Dowideit bc3e877db3 expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path 
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
 2013-11-16 20:15:04 +10:00
Michael Crosby b91918adb1 Merge pull request #2694 from shykes/separate-integration-tests 
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
 2013-11-15 18:21:34 -08:00
Andy Rothfusz b666bf948d Fixes #2701. Adds security section. 
Upstream-commit: d33ffe44a9f09b0e0aedf162ee17076571479003
Component: engine
 2013-11-15 18:12:35 -08:00