Commit Graph
3902 Commits
Author SHA1 Message Date
Mark Allen 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
Marc Kuo 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
Nate Jones 02bfc139c1 fixup for rebase
Upstream-commit: 22ef38ee79c2f353578f3642918a44126b4cb48c
Component: engine
2013-11-06 04:23:07 +00:00
Nate Jones 2e403649d0 update "images" documentation
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
2013-11-06 04:23:07 +00:00
Nate Jones e9a1f4f7ff add image size to -tree
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
2013-11-06 04:23:07 +00:00
Nate Jones 377a3eb7ca adding test for "images -tree"
Upstream-commit: f1aeac361aadc90a35e1b839933afbf9ad27a1a1
Component: engine
2013-11-06 04:23:02 +00:00
Nate Jones 7820a4a479 adding test for "images -viz"
Upstream-commit: d9fe0647cb464ccd6f79ac33fb1d1ac56441f6b0
Component: engine
2013-11-06 04:04:24 +00:00
Nate Jones f53ad091dd make existing tests pass
Upstream-commit: 059bb7a262a7620d8c7c5fdd064af352ae242f65
Component: engine
2013-11-06 03:58:16 +00:00
Nate Jones 2dbd3407de implement "images -tree"
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
2013-11-06 03:58:16 +00:00
Nate Jones 736f474973 bring back /images/viz, but 404 for latest
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones cbbaa36a2b move "images -viz" to client
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones 08d9fe490e fix "images -a"
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones b5c0cbf917 bump api version and ensure backward compat
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones 59c6d98498 rework images JSON
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
2013-11-06 03:58:15 +00:00
Mark Allen 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
unclejack a503078311 fix build for commands_test
Upstream-commit: cdf0cf495d0e0f0bbfdd8021f9cd6e68a8234dd4
Component: engine
2013-11-06 01:41:54 +02:00
Andy Rothfusz 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
Andy Rothfusz 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
Tianon Gravi 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
Daniel Mizyrycki 893c4c44a9 contrib: Desktop integration. Firefox usecase.
Upstream-commit: 5af87d147580555c72e6a1d448ab663f991cc737
Component: engine
2013-11-05 13:21:52 -08:00
unclejack 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
unclejack 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
unclejack 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
unclejack 26ce0d7e39 disallow / as source for bind mount in the cli
This makes the docker cli reject docker run commands which include bind
mounts like "/:/some/path/in/the/container".
Bind mounting the root directory is a bad idea and the cli should throw
an error right away.

The same check will also be made by the remote API via another commit.
Upstream-commit: 4b8c41c4a2591797f97ad079e4314b21498ba732
Component: engine
2013-11-05 22:52:54 +02:00
James Turnbull 8da2c74ae5 Removed redundant linking example
Upstream-commit: e88368b34cab8d4b7d5a1179cdd25fc9cd2b3d79
Component: engine
2013-11-05 14:28:57 -06:00
Tehmasp Chaudhri 7eaaa6080e (doc) Update ubuntulinux.rst
small grammar changes - hopefully not worse than original :)
Upstream-commit: 4d5ecdbeb4e428d92c5a0089378f7bae9b3ca3d9
Component: engine
2013-11-05 12:08:56 -07:00
Victor Vieux a193590012 Merge pull request #2554 from dotcloud/copy-config-on-build
Use parent image config in buildfile
Upstream-commit: 114e01cdc1457a2a6ceb2288f3d72cbd3614dc8f
Component: engine
2013-11-05 10:54:49 -08:00
Victor Vieux 9fe5aeedd4 Merge pull request #2517 from gurjeet/patch-2
Add gurjeet  as an author
Upstream-commit: 7f7926525ac1aa1bd470121dbba22588f95e789e
Component: engine
2013-11-05 10:52:54 -08:00
Andy Rothfusz d216ad8055 Merge pull request #2559 from pattichen/master
Fix typo
Upstream-commit: 714acf5ade98c4a3ec4069390b8cd66107347ab9
Component: engine
2013-11-05 10:30:15 -08:00
Andy Rothfusz b64b038b00 Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
2013-11-05 10:29:54 -08:00
Solomon Hykes 7380c2e120 Merge pull request #2 from tianon/dm-plugin-dockerfile
Hack: Add lvm2 static compilation to Dockerfile
Upstream-commit: 140da580d4f0efaf6c1bc470a16edc7c7f2477c7
Component: engine
2013-11-05 09:35:03 -08:00
Guillaume J. Charmes 255b88c532 Check the output of iptables command.
Upstream-commit: ff8a4ba0aa20dc3b382e2dcddcd89bb0bb168496
Component: engine
2013-11-05 08:33:13 -08:00
pattichen b09631ee21 Fix typo
Upstream-commit: 2cac81393715e6a748b3a2316d5163604497b26c
Component: engine
2013-11-04 22:36:57 -08:00
Michael Crosby cb784bb36f Finalize driver interfaces
Upstream-commit: ed572b457d28101b6ef465e5a3e221ee1fc7d48a
Component: engine
2013-11-04 20:51:12 -08:00
Tianon Gravi 8d563825a1 Bump Dockerfile to go1.2rc3
Upstream-commit: fcc0ac61093d0cd0b49b11bb5f7f7501e070bd63
Component: engine
2013-11-04 21:12:18 -07:00
Victor Vieux 956deb4fe0 Merge pull request #2502 from hamo/unlink_err_v4
rewrite protocol check with switch-case in Server.Daemon
Upstream-commit: c5d4459a02ee98f629e65402551a871c451fb6ac
Component: engine
2013-11-04 17:46:46 -08:00
James Turnbull 14d0aebe52 Updated Redis service example to use links
Upstream-commit: 1182797c6d6bf4bb87e5edcddd75edb3f995dac0
Component: engine
2013-11-04 19:18:37 -06:00
Victor Vieux 22e1fc60ec Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
Tianon Gravi 4349b8fd0b Merge pull request #2365 from tianon/sysvinit-consistency
Update sysvinit script to fix a few inconsistencies and be more useful/correct downstream
Upstream-commit: 8ad46ef401fd0665efe16f50021a5a48a14b51e5
Component: engine
2013-11-04 15:34:51 -08:00
Victor Vieux 4dd237b1bf remove column size hack
Upstream-commit: 854cc5f55992b8bb200f470b11896a0b3cb68d4e
Component: engine
2013-11-04 15:34:51 -08:00
Michael Crosby 14efe59bac Add graph driver registration
Upstream-commit: 752bfba2c5d6030d6fe3d615d0c2afd2696e7b20
Component: engine
2013-11-04 15:22:34 -08:00
Tianon Gravi 2e3d85e90f Add libdevmapper static compilation to Dockerfile for device-mapper
Upstream-commit: d11f75b5050944e373125008be1c9683797c72a9
Component: engine
2013-11-04 16:11:33 -07:00
Tianon Gravi 57c35f0f44 Update Dockerfile to consistently use tabs as the command argument separator
Upstream-commit: 24dd838aeefcf4ea1f5a950a9fe0af075f00e2bf
Component: engine
2013-11-04 15:39:16 -07:00
Michael Crosby 6a08c29b8a Merge pull request #2499 from dotcloud/2414-logs_tty-fix
Fix logs with tty
Upstream-commit: 57cd17f6568205d8dadf38b94768a68582c9af11
Component: engine
2013-11-04 14:22:08 -08:00
Michael Crosby 33ea8b01c4 Use parent image config in buildfile
Upstream-commit: 99141ea3ca3c0429ecdfc3bdb097a68957beab71
Component: engine
2013-11-04 13:20:14 -08:00
Roberto Gandolfo Hashioka b6ee1ce3fa - Removed some unconfirmed info
- Added reference to the index.rst
Upstream-commit: 3061e9f37434fa6bb0714861119ae01d8c4b35fb
Component: engine
2013-11-04 13:16:51 -08:00
Andy Rothfusz 801c058dee Merge pull request #2534 from jamtur01/examples_fixes
A variety of syntax and style fixes for the Docker examples
Upstream-commit: 19ad299600ff9acddc7baf1a97deab231c669f50
Component: engine
2013-11-04 12:35:57 -08:00
Victor Vieux d5f3dc4566 add CmdLogs test
Upstream-commit: 177a2f5946623a4d4f90f5a227e57211eed6ade3
Component: engine
2013-11-04 12:23:35 -08:00
Victor Vieux 39f858c891 Fix logs with tty
Upstream-commit: 1f44fd8624d1de3f7e1e55880352faef2e141fb1
Component: engine
2013-11-04 12:19:20 -08:00
Guillaume J. Charmes 0d76c57f44 Merge pull request #2549 from dotcloud/ensure-container-name
Ensure container name on register
Upstream-commit: c065e564fb6dd6799a37ae1deb1f4e68498d04f5
Component: engine
2013-11-04 12:12:42 -08:00