c81beb4bbc
- Fix the attach examples according to the new attach behavior
...
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
Upstream-commit: 304d39cc505ff51682dd7e1337f9f0ab7536eec3
Component: engine
2013-11-07 14:06:49 -08:00
65b7bbeca7
archive.ApplyLayer() remove files recursively
...
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
Upstream-commit: 484804abffda2692492e295d4691f90564d05eb2
Component: engine
2013-11-07 22:46:44 +01:00
e285c55a83
Merge pull request #2589 from dotcloud/gofmt
...
Go fmt
Upstream-commit: cd4f7321c932efe2c95e221e2e685856c79ef30d
Component: engine
2013-11-07 12:32:58 -08:00
4629ddf3be
Fix a crash in graphdriver init
...
Upstream-commit: a63ff8da46e11c857cd3d743d72d211c96b637e4
Component: engine
2013-11-07 20:31:50 +00:00
a48448b288
Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly
...
Upstream-commit: 77ae9789d3e1cfb895de9eaf343866f984c92668
Component: engine
2013-11-07 20:30:56 +00:00
8d5420a376
Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails
...
Fix Assign id as name when all else fails
Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec
Component: engine
2013-11-07 12:29:02 -08:00
6d24142423
go fmt
...
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
b5fe937fc9
fix Assign id as name when all else fails
...
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
2013-11-07 12:23:29 -08:00
9fe27fc825
Fix 2585 and clean up warning in contributing.rst
...
Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e
Component: engine
2013-11-07 12:20:23 -08:00
61da922aa3
Merge pull request #2561 from dotcloud/add_iptabled_errors
...
Make iptable return an error in case of output
Upstream-commit: b5c984f9b4899d577430134135379b0088d88b47
Component: engine
2013-11-07 09:15:09 -08:00
ba4e682cde
docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
...
Upstream-commit: 249f76bebdb3c24ae0a59e3be7ae73fd1d88c065
Component: engine
2013-11-06 20:05:26 -08:00
83a4080e03
docker-ci 0.40. Migrate docker-ci to Digital Ocean.
...
Upstream-commit: e7df38dbd0c7bf2d27632809fc49cacb0cc7f869
Component: engine
2013-11-06 19:13:58 -08:00
837c6b480c
docker-ci 0.37. Patch hack/dind with latest code for docker-test.
...
Upstream-commit: efb4c800a7c8167cf2202466a720c0fad7001a5d
Component: engine
2013-11-06 19:13:58 -08:00
7a7c9f0f1d
docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
...
Upstream-commit: 0cbeda73910d6d1d3336da93c5f94df0bdd5fa44
Component: engine
2013-11-06 19:13:58 -08:00
aac90cd92e
docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease
...
Upstream-commit: 17172276366fc3114ae52eb6c83aafbec004d5f3
Component: engine
2013-11-06 19:13:58 -08:00
6b8ac9d257
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
...
Upstream-commit: 50dd9791f75efef77a85bbe6556c85de0d845c0a
Component: engine
2013-11-06 19:13:58 -08:00
80db89881c
Fix bold
...
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
2013-11-06 18:07:55 -08:00
9970f516fc
updated create, showing how to set expose port and bind to public port for ssh
...
Upstream-commit: 2d1155407a6e24b595d2627af6fa9f9f702483d2
Component: engine
2013-11-06 18:07:55 -08:00
d4449d4111
Merge pull request #2557 from jamtur01/new_redis
...
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
Upstream-commit: 37dcff0c13c6e4ee71b22b7e4902c2e4b4b88132
Component: engine
2013-11-06 17:54:34 -08:00
493375c769
Merge pull request #2567 from mck-/patch-1
...
Add -p when running the container (node example)
Upstream-commit: 38f1838e821822037f334dc4aee1da9a3c76c53c
Component: engine
2013-11-06 17:34:11 -08:00
a16746b24c
Merge pull request #1794 from justone/add-images-tree
...
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
2013-11-06 16:12:36 -08:00
0e9c1fdcf5
Merge pull request #2577 from dotcloud/bump_v0.6.6
...
Bump v0.6.6
Upstream-commit: cb1c90975bbb2b3962b2ba611c58adac69bcf0c1
Component: engine
2013-11-06 13:41:52 -08:00
85bf6b92cb
updating cli help doc for images
...
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
2013-11-06 12:03:45 -08:00
6863c4fe21
Merge pull request #2577 from dotcloud/bump_v0.6.6
...
Bump v0.6.6
Upstream-commit: 6d420407caf533f89b60d78c54e0ddc2d307e942
Component: engine
2013-11-06 12:03:03 -08:00
5edb271922
lxc: Work around lxc-start need for private mounts
...
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.
We work around this by starting up lxc-start in its own namespace where
we set / to rshared.
Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
Upstream-commit: 157d99a72786c454dfaad8b0800914cc80879aa8
Component: engine
2013-11-06 20:43:06 +01:00
7bfea51316
Bump version to v0.6.6
...
Upstream-commit: 360a694c52a48e0305317a18c59dc5ddc44859ad
Component: engine
2013-11-06 11:43:02 -08:00
58f4b4c19f
Utils: Add ShellQuoteArguments
...
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
2013-11-06 20:39:09 +01:00
143de969f1
fix /images/json doc for 1.7
...
Upstream-commit: 16eba6bbb514fb4082e6779e175a29698a6734ce
Component: engine
2013-11-06 11:30:04 -08:00
34d9e796b2
Merge pull request #2568 from mrallen1/fix/1965
...
See if a path exists before injecting Reader there
Upstream-commit: 0dd6c6645bd7148537c6e4b3b32abe1c852b992c
Component: engine
2013-11-06 10:57:06 -08:00
a135b385fd
Update documentation to reflect changes in Config and HostConfig
...
Upstream-commit: 70f44d5531a5c6dcb96b7e608a96beb52e93b506
Component: engine
2013-11-06 10:01:58 -08:00
d677b4b873
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
2013-11-06 09:45:23 -08:00
2e67093fd5
Merge pull request #1577 from mrallen1/fix/1502
...
Prevent DNS server conflicts in CreateBridgeIface
Upstream-commit: c22ff0296e743443b3d79b0bd5f8b9bd97a77e13
Component: engine
2013-11-06 07:52:50 -08:00
563816191a
Add debug to iptables
...
Upstream-commit: 00f1398f7a8543e2448723635d93ea6ddf1eaadb
Component: engine
2013-11-06 07:37:43 -08:00
73c7a730fc
See if a path exists before injecting Reader there
...
Closes #1965
Upstream-commit: 74f853a2aeaf86ff675ecab5387bbd710a0138b7
Component: engine
2013-11-05 23:44:52 -06:00
f530e76f7f
gograph: allow Walk() reentrance
...
Hold the read lock while reading the child graph,
then walk over the children without any lock, in
order to avoid deadlock.
Upstream-commit: 20881f1f787e093a6f3e9360624d8b436b9f7379
Component: engine
2013-11-06 00:18:45 -05:00
c0461f4ee4
Add -p when running the container
...
Without it, docker was not mapping/exposing the private port
Docker version 0.6.5, build 3ff8459
Upstream-commit: 3108f0526ef25596c7f6f545b07c95d90e966a7d
Component: engine
2013-11-05 20:48:16 -08:00
02bfc139c1
fixup for rebase
...
Upstream-commit: 22ef38ee79c2f353578f3642918a44126b4cb48c
Component: engine
2013-11-06 04:23:07 +00:00
2e403649d0
update "images" documentation
...
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
2013-11-06 04:23:07 +00:00
e9a1f4f7ff
add image size to -tree
...
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
2013-11-06 04:23:07 +00:00
377a3eb7ca
adding test for "images -tree"
...
Upstream-commit: f1aeac361aadc90a35e1b839933afbf9ad27a1a1
Component: engine
2013-11-06 04:23:02 +00:00
7820a4a479
adding test for "images -viz"
...
Upstream-commit: d9fe0647cb464ccd6f79ac33fb1d1ac56441f6b0
Component: engine
2013-11-06 04:04:24 +00:00
f53ad091dd
make existing tests pass
...
Upstream-commit: 059bb7a262a7620d8c7c5fdd064af352ae242f65
Component: engine
2013-11-06 03:58:16 +00:00
2dbd3407de
implement "images -tree"
...
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
2013-11-06 03:58:16 +00:00
736f474973
bring back /images/viz, but 404 for latest
...
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
2013-11-06 03:58:15 +00:00
cbbaa36a2b
move "images -viz" to client
...
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
2013-11-06 03:58:15 +00:00
08d9fe490e
fix "images -a"
...
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
2013-11-06 03:58:15 +00:00
b5c0cbf917
bump api version and ensure backward compat
...
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
2013-11-06 03:58:15 +00:00
59c6d98498
rework images JSON
...
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
2013-11-06 03:58:15 +00:00
a507d209c4
Prevent DNS server conflicts in CreateBridgeIface
...
Retrieve /etc/resolv.conf data (if available)
Add checkNameserverOverlaps and call it to
make sure there are no conflicts
Add utils.GetNameserversAsCIDR and tests
Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
2013-11-05 21:24:37 -06:00
b581ea208c
gograph: Use RWMutex to allow concurrent readers
...
Upstream-commit: 04aca7c9e3edddc57a1fbc11e57e6c62e6847126
Component: engine
2013-11-05 22:07:14 -05:00
