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
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
a503078311
fix build for commands_test
...
Upstream-commit: cdf0cf495d0e0f0bbfdd8021f9cd6e68a8234dd4
Component: engine
2013-11-06 01:41:54 +02:00
2a939ef85f
lock around read operations in graph
...
Writes and reads will fail with ErrBusy if there's
concurrent reads or writes, respectively. It is
not sufficient to only lock around writes.
Upstream-commit: 1dc34e2b965253a62d52f84a0f548334d4d6aa9d
Component: engine
2013-11-05 18:26:07 -05:00
e83abd1b63
Remove debug messages
...
Upstream-commit: 8d6df3a7e2080d4fad9743beb159f12caa0ff6f7
Component: engine
2013-11-05 23:00:20 +00:00
e6df3df72c
Engine: 'create' creates a container and prints its ID on stdout
...
Upstream-commit: e5f8ab6160401fb541121da5b5cbc3af4fce28b7
Component: engine
2013-11-05 23:00:20 +00:00
bf0674c59a
Fix main()
...
Upstream-commit: 5c42b2b5122c1db08d229c258da26869b4d4d9cc
Component: engine
2013-11-05 23:00:20 +00:00
c3fb3fd512
Better error reporting in engine logs and unit tests
...
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
2013-11-05 23:00:20 +00:00
53c37bc88e
Engine: fix a bug when encoding a job environment to json
...
Upstream-commit: 434f06d03dc2825cb4f348a88ddc6d1aa17ea19c
Component: engine
2013-11-05 23:00:20 +00:00
c136168290
Hack: simplify the creation of test directories
...
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
2013-11-05 23:00:16 +00:00
bbfaa00404
Merge pull request #2562 from tchaudhri/patch-1
...
(doc) Update ubuntulinux.rst
Upstream-commit: 980eda4c25c2221127f93b7b5194e372a29be197
Component: engine
2013-11-05 14:52:07 -08:00
8a1dabb05a
Merge pull request #2423 from rogaha/volumes_doc
...
Added volumes documentation
Upstream-commit: bf05eb8ac0a8c919131c9c640e52b73387b9a1e0
Component: engine
2013-11-05 14:38:28 -08:00
e77776215c
Merge pull request #2563 from mzdaniel/desktop-integration
...
contrib: Desktop integration. Firefox usecase.
Upstream-commit: f3f9f652e1fac6039784ff11290a5cb5979ad024
Component: engine
2013-11-05 14:02:13 -08:00
893c4c44a9
contrib: Desktop integration. Firefox usecase.
...
Upstream-commit: 5af87d147580555c72e6a1d448ab663f991cc737
Component: engine
2013-11-05 13:21:52 -08:00
497f4207e9
test: error out when bind mount source doesn't exist
...
This adds a test to verify that the server is checking whether the path
to be bind mounted actually exists on the server.
Upstream-commit: 35430e89201972d877ba01405f966882a1d3888a
Component: engine
2013-11-05 22:54:24 +02:00
9f8cb6e156
validate bind mounts on the server side
...
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
The source to be bind mounted must exist.
This fixes issue #2070 .
Upstream-commit: 4d2ba779e1a0596c51cc6ed2ddb7c2139830f15c
Component: engine
2013-11-05 22:54:24 +02:00
730dda3e21
add test to ensure / can't be bind mounted
...
This adds a test which checks that we're erroring out when we attempt
to bind mount root in a container.
Upstream-commit: f1f39616eb052455a383de589bbc1eaa9ab5d96c
Component: engine
2013-11-05 22:54:24 +02:00
