toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,541 Commits 3 Branches 295 Tags
a3c4139aadd445dcffc705453aaabe3a961f4ada
Commit Graph
4541 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Larsson 63db5cd7f5 Mark archive.TestApplyLayer as skipped 
Instead of just returning we call Skip to log that the test
was skipped.
Upstream-commit: 8ed4307f50b93d7c49eccf30357a4b9d3fbb1376
Component: engine
 2013-11-18 14:31:34 +01: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 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
Solomon Hykes 25c99ca04e Re-enable api integration tests using only public remote API. 
Upstream-commit: afe230718ead8cb1d1053a7132a034f0bd55b424
Component: engine
 2013-11-16 02:12:14 +00:00
Michael Crosby 6d014fee93 Merge pull request #40 from shykes/creack-0.6.5-dm-plugin 
Rename gograph and move drivers to sub pkg
Upstream-commit: 427649eee12c253ad24ec694353aea148e24eb08
Component: engine
 2013-11-15 17:31:50 -08:00
Guillaume J. Charmes 9d193b1c00 WIP 
Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021
Component: engine
 2013-11-15 17:16:30 -08:00
Victor Vieux 10d4ab171f Fix tmp dir never cleanup 
Upstream-commit: 926169059374fb7a7a7035dde4e78f3418778a80
Component: engine
 2013-11-15 16:23:55 -08:00
Guillaume J. Charmes 73e6c3f45e rename gograph in graphdb 
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
 2013-11-15 15:55:45 -08:00
Guillaume J. Charmes 052ebaaf52 Move all drivers to the same subdir graphdriver 
Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd
Component: engine
 2013-11-15 15:48:24 -08:00
Guillaume J. Charmes bf47a58ff7 Merge pull request #38 from crosbymichael/add-container-driver 
Save driver to container and skip incompat containers
Upstream-commit: fb245f79038294a1a3ea51f47ce2e62ffad6b5d1
Component: engine
 2013-11-15 14:20:19 -08:00
Guillaume J. Charmes d49c3e47d7 Merge pull request #36 from crosbymichael/unlink-init-files 
Unlink docker init files
Upstream-commit: dc5b7b32c3ad42a6414a2c6bb0e1be6743c746fc
Component: engine
 2013-11-15 14:09:51 -08:00
Andy Rothfusz c2f970187c Merge pull request #2709 from eugenkrizo/patch-1 
path needs to be specified to 'docker build' command
Upstream-commit: e12bba66ea784e0c7859b5679d6a55d639889508
Component: engine
 2013-11-15 13:34:08 -08:00
Andy Rothfusz 4f21d884c5 Merge pull request #2713 from eugenkrizo/patch-2 
port published explicitly (for docker 0.6.6)
Upstream-commit: 92c3a319fba58132bfc918a3bde8dcc64e00304c
Component: engine
 2013-11-15 13:32:18 -08:00
Andy Rothfusz f5175fa4bb Merge pull request #2685 from Painted-Fox/patch-1 
Add more depth to the upstart example in host_integration.rst
Upstream-commit: 323e86032db8941135bea418cfbddc8d20739c0e
Component: engine
 2013-11-15 12:28:07 -08:00
Victor Vieux d46ca98228 bring back tests about LXCConfig 
Upstream-commit: c06d903edd7b16588e68680a989b73e27d990871
Component: engine
 2013-11-15 11:48:18 -08:00
Andy Rothfusz da637b552f Fix typos, add links, streamline content of #2592 
Upstream-commit: 9a9d3239e10b55cc15bb38788a411d9a16c477fc
Component: engine
 2013-11-15 11:38:03 -08:00
Andy Rothfusz dc84120dc9 Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592 
Upstream-commit: 33110ddc3fbb457d071fa9a53f9bb76e52dd724b
Component: engine
 2013-11-15 11:15:14 -08:00
Andy Rothfusz 07dd17035d Merge pull request #2689 from metalivedev/fix-syntax 
Clean up sphinx syntax
Upstream-commit: 6341768393a8b48cc37e29f43efdffd3fa4caf33
Component: engine
 2013-11-15 11:09:51 -08:00
Victor Vieux b2bdca3ec2 Merge pull request #2712 from makinacorpus/master 
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
 2013-11-15 10:33:41 -08:00
Michael Crosby c579e87812 Merge pull request #33 from alexlarsson/dm-plugin-status 
Add driver plugin status
Upstream-commit: 7cad77b1e2d0b8af5dcadce0599fc83cbe1970f4
Component: engine
 2013-11-15 10:15:59 -08:00
Guillaume J. Charmes b0ad480645 Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes 
Use dummy driver for volumes
Upstream-commit: 2b23da1d2ff14c3f62a4c4b1ea78084598a58ca6
Component: engine
 2013-11-15 09:41:16 -08:00
Guillaume J. Charmes d77afe3b14 Merge pull request #30 from alexlarsson/dm-plugins-archive-tests 
Dm plugins archive tests
Upstream-commit: bcf96d95bce927b23b03703f27965019e727313c
Component: engine
 2013-11-15 09:38:17 -08:00
eugenkrizo 3c67b07093 port published explicitly (for docker 0.6.6) 
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
 2013-11-15 17:12:48 +01:00
Mathieu Le Marec - Pasquet 61d22b0c3d Merge pull request #1 from jpetazzo/2392-add-kernel-docs 
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
Upstream-commit: 76ab8fa00ffca136c50b58b4215eb063458f4a5b
Component: engine
 2013-11-15 07:58:54 -08:00
eugenkrizo bc283849de path needs to be specified to 'docker build' command 
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
 2013-11-15 16:16:59 +01:00
Alexander Larsson faff941ade Use dummy driver for volumes 
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.

This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
Upstream-commit: 10f23a94f6daaf03c684937daea67d10205b4b89
Component: engine
 2013-11-15 11:30:28 +01:00
Alexander Larsson fa730d3073 Print devicemapper status details in docker info 
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.

The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
 2013-11-15 11:04:02 +01:00