Michael Crosby
cfbd9ea16d
Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD
...
Do not forward SIGCHLD to container
2013-11-18 11:24:08 -08:00
Michael Crosby
75dd1663e0
Merge pull request #2638 from FreakyDazio/2506-name-conflict-error
...
More informative error message on name collisions
2013-11-18 11:13:43 -08:00
Darren Coxall
3c67a28493
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.
2013-11-18 17:51:47 +00:00
Josh Poimboeuf
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
Josh Poimboeuf
fc2f5758cf
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.
2013-11-18 11:42:30 -06:00
Josh Poimboeuf
fe302fbfd2
test: 2 second timeout (not 2000)
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
72d02ecdde
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.
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
baa687bed2
test: fix TestCreateStartRestartStopStartKillRm
...
cat needs stdin opened, otherwise it dies immediately.
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
30ea0bebce
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.
2013-11-18 10:23:06 -06:00
Alexander Larsson
8ed4307f50
Mark archive.TestApplyLayer as skipped
...
Instead of just returning we call Skip to log that the test
was skipped.
2013-11-18 14:31:34 +01:00
Tianon Gravi
9e1da3ec9c
Update to go1.2rc5
2013-11-17 22:36:26 -07:00
Rick Bradley
b76574f855
Tiny typo cleanup
2013-11-17 21:10:06 -08:00
Tianon Gravi
457375ea37
Merge pull request #2732 from jplock/patch-2
...
Fix images not being properly tagged in mkimage-debootstrap.sh
2013-11-17 08:06:58 -08:00
Frederik Loeffert
7e580aacec
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-17 01:20:21 +01:00
Justin Plock
0e64b987e8
Fix images not being properly tagged
2013-11-16 11:05:38 -05:00
Sven Dowideit
bc74f65068
make the docker commit help more copy&pasteable
2013-11-16 21:11:34 +10:00
Sven Dowideit
5c741ef11d
add example
2013-11-16 20:53:45 +10:00
Sven Dowideit
152459b727
add some common examples for docker images, and tell the user what -a filters out
2013-11-16 20:45:30 +10:00
Sven Dowideit
f04142c1f7
add example for docker history
2013-11-16 20:36:33 +10:00
Sven Dowideit
af05ab399e
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-16 20:26:47 +10:00
Sven Dowideit
27159ce6ba
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
2013-11-16 20:15:04 +10:00
Michael Crosby
51576069ad
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
2013-11-15 18:21:34 -08:00
Andy Rothfusz
d33ffe44a9
Fixes #2701 . Adds security section.
2013-11-15 18:12:35 -08:00
Solomon Hykes
afe230718e
Re-enable api integration tests using only public remote API.
2013-11-16 02:12:14 +00:00
Michael Crosby
427649eee1
Merge pull request #40 from shykes/creack-0.6.5-dm-plugin
...
Rename gograph and move drivers to sub pkg
2013-11-15 17:31:50 -08:00
Guillaume J. Charmes
a518b84751
WIP
2013-11-15 17:16:30 -08:00
Victor Vieux
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08:00
Guillaume J. Charmes
035c144242
Move all drivers to the same subdir graphdriver
2013-11-15 15:48:24 -08:00
Guillaume J. Charmes
fb245f7903
Merge pull request #38 from crosbymichael/add-container-driver
...
Save driver to container and skip incompat containers
2013-11-15 14:20:19 -08:00
Guillaume J. Charmes
dc5b7b32c3
Merge pull request #36 from crosbymichael/unlink-init-files
...
Unlink docker init files
2013-11-15 14:09:51 -08:00
Andy Rothfusz
e12bba66ea
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
2013-11-15 13:34:08 -08:00
Andy Rothfusz
92c3a319fb
Merge pull request #2713 from eugenkrizo/patch-2
...
port published explicitly (for docker 0.6.6)
2013-11-15 13:32:18 -08:00
Andy Rothfusz
323e86032d
Merge pull request #2685 from Painted-Fox/patch-1
...
Add more depth to the upstart example in host_integration.rst
2013-11-15 12:28:07 -08:00
Victor Vieux
c06d903edd
bring back tests about LXCConfig
2013-11-15 11:48:18 -08:00
Andy Rothfusz
9a9d3239e1
Fix typos, add links, streamline content of #2592
2013-11-15 11:38:03 -08:00
Andy Rothfusz
33110ddc3f
Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592
2013-11-15 11:15:14 -08:00
Andy Rothfusz
6341768393
Merge pull request #2689 from metalivedev/fix-syntax
...
Clean up sphinx syntax
2013-11-15 11:09:51 -08:00
Victor Vieux
ad96d5ff04
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
2013-11-15 10:33:41 -08:00
Michael Crosby
7cad77b1e2
Merge pull request #33 from alexlarsson/dm-plugin-status
...
Add driver plugin status
2013-11-15 10:15:59 -08:00
Guillaume J. Charmes
2b23da1d2f
Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes
...
Use dummy driver for volumes
2013-11-15 09:41:16 -08:00
Guillaume J. Charmes
bcf96d95bc
Merge pull request #30 from alexlarsson/dm-plugins-archive-tests
...
Dm plugins archive tests
2013-11-15 09:38:17 -08:00
eugenkrizo
492ce4c665
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
2013-11-15 17:12:48 +01:00
Mathieu Le Marec - Pasquet
76ab8fa00f
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.
2013-11-15 07:58:54 -08:00
eugenkrizo
007964793d
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
2013-11-15 16:16:59 +01:00
Alexander Larsson
10f23a94f6
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.
2013-11-15 11:30:28 +01:00
Alexander Larsson
243843c078
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.
2013-11-15 11:04:02 +01:00
Alexander Larsson
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
Alexander Larsson
f7238f94e8
Add tests for the changes detection code
...
This adds 3 tests:
Verify that ChangesDirs() returns nothing when run on a copy of the
same directory.
Verify that various mutations of a directory get reported with the
right changes.
Verify that ExportChanges() + ApplyLayer() of the above mutation gets
an identical directory.
Unfortunately the last test is disabled because it fails in multiple
ways atm. But I want to get it in so that we can fix it.
2013-11-15 09:49:46 +01:00
Alexander Larsson
d69a6a20f0
Use ExportChanges() in runtime.Diff()
...
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
2013-11-15 09:49:42 +01:00
