ab0ebf12a7
Merge pull request #2566 from unclejack/fix_commands_test
...
fix build for commands_test
Upstream-commit: 6113e1d62d429e7520a517ecbff331d58d51a0b7
Component: engine
2013-11-05 15:45:22 -08: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
ef5e2b951f
Merge branch 'finalize-interfaces' into 0.6.5-dm-plugin
...
Upstream-commit: 4d90e9124390a7b1da125f0973fee72b83e19e93
Component: engine
2013-11-05 23:24:46 +00: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
63b79169a2
Merge pull request #2298 from unclejack/2070-validate_src_for_bind_mounts
...
validate source for bind mounts
Upstream-commit: 2205bb43ea1e1709b104896266edeaf58395005b
Component: engine
2013-11-05 13:31:10 -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
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
8da2c74ae5
Removed redundant linking example
...
Upstream-commit: e88368b34cab8d4b7d5a1179cdd25fc9cd2b3d79
Component: engine
2013-11-05 14:28:57 -06:00
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
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
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
5d5633048a
Engine: optional environment variable 'Logging' in 'serveapi'
...
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
2013-11-05 18:39:59 +00:00
18c16d13e3
Engine: improved logging and identification of jobs
...
Upstream-commit: 4e7cb37dcc18975010df630d8c9580a3a65e0e69
Component: engine
2013-11-05 18:39:59 +00:00
be8463c1d5
Engine: don't export private testing utilities
...
Upstream-commit: ca6f0aa107117d2125a63eb5e78d74095bf08a4c
Component: engine
2013-11-05 18:39:59 +00:00
02af0b7684
Engine: fix a bug which caused handlers to be shared between multiple engine instances
...
Upstream-commit: 847411a1ee6e5ee5d051fc4729425215dc0c8561
Component: engine
2013-11-05 18:39:59 +00:00
6d10998928
httpapi: don't create a pidfile if it isn't set in the configuration
...
Upstream-commit: 7b17d555992c65c6b10da21c8aa48062a1aba0d9
Component: engine
2013-11-05 18:39:59 +00:00
26507356b3
Engine: 'start' starts the specified container
...
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
2013-11-05 18:39:59 +00:00
d216ad8055
Merge pull request #2559 from pattichen/master
...
Fix typo
Upstream-commit: 714acf5ade98c4a3ec4069390b8cd66107347ab9
Component: engine
2013-11-05 10:30:15 -08:00
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
6c362cebcc
Add ability to mount volumes in readonly mode using -volumes-from
...
Upstream-commit: f9cb6ae46a3478c19e85a2a159c4ac31223ec499
Component: engine
2013-11-05 11:58:51 -06:00
8a182f4aaf
Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
...
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
2013-11-05 17:41:37 +00:00
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
255b88c532
Check the output of iptables command.
...
Upstream-commit: ff8a4ba0aa20dc3b382e2dcddcd89bb0bb168496
Component: engine
2013-11-05 08:33:13 -08:00
adf42b39d6
Merge pull request #2558 from tianon/go-bump
...
Bump Dockerfile to go1.2rc3
Upstream-commit: dcaaecc8152febdbb339e5f2f289db6a8e133a54
Component: engine
2013-11-04 23:39:10 -08:00
b09631ee21
Fix typo
...
Upstream-commit: 2cac81393715e6a748b3a2316d5163604497b26c
Component: engine
2013-11-04 22:36:57 -08:00
cb784bb36f
Finalize driver interfaces
...
Upstream-commit: ed572b457d28101b6ef465e5a3e221ee1fc7d48a
Component: engine
2013-11-04 20:51:12 -08:00
8d563825a1
Bump Dockerfile to go1.2rc3
...
Upstream-commit: fcc0ac61093d0cd0b49b11bb5f7f7501e070bd63
Component: engine
2013-11-04 21:12:18 -07:00
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
14d0aebe52
Updated Redis service example to use links
...
Upstream-commit: 1182797c6d6bf4bb87e5edcddd75edb3f995dac0
Component: engine
2013-11-04 19:18:37 -06:00
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
80fe4981a3
Merge branch 'dm-plugin-dockerfile' into 0.6.5-dm-plugin
...
Upstream-commit: 66bf395e4db97e11dc09a404f1b42f1492fefd6d
Component: engine
2013-11-04 23:41:23 +00:00
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
4dd237b1bf
remove column size hack
...
Upstream-commit: 854cc5f55992b8bb200f470b11896a0b3cb68d4e
Component: engine
2013-11-04 15:34:51 -08:00
4143b61e6c
Merge pull request #1 from crosbymichael/register-plugins
...
Add graph driver registration
Upstream-commit: 5bad7d72291a5d37fe328b2d8742bfe1ff1f94f7
Component: engine
2013-11-04 15:25:57 -08:00
14efe59bac
Add graph driver registration
...
Upstream-commit: 752bfba2c5d6030d6fe3d615d0c2afd2696e7b20
Component: engine
2013-11-04 15:22:34 -08:00
2e3d85e90f
Add libdevmapper static compilation to Dockerfile for device-mapper
...
Upstream-commit: d11f75b5050944e373125008be1c9683797c72a9
Component: engine
2013-11-04 16:11:33 -07:00
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
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
