Guillaume J. Charmes
45aba3dc95
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
2013-11-06 09:45:23 -08:00
Guillaume J. Charmes
c22ff0296e
Merge pull request #1577 from mrallen1/fix/1502
...
Prevent DNS server conflicts in CreateBridgeIface
2013-11-06 07:52:50 -08:00
Guillaume J. Charmes
00f1398f7a
Add debug to iptables
2013-11-06 07:37:43 -08:00
Mark Allen
74f853a2ae
See if a path exists before injecting Reader there
...
Closes #1965
2013-11-05 23:44:52 -06:00
Daniel Norberg
20881f1f78
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.
2013-11-06 00:18:45 -05:00
Marc Kuo
3108f0526e
Add -p when running the container
...
Without it, docker was not mapping/exposing the private port
Docker version 0.6.5, build 3ff8459
2013-11-05 20:48:16 -08:00
Nate Jones
22ef38ee79
fixup for rebase
2013-11-06 04:23:07 +00:00
Nate Jones
6d5b73c2a6
update "images" documentation
2013-11-06 04:23:07 +00:00
Nate Jones
b7d1d35c27
add image size to -tree
2013-11-06 04:23:07 +00:00
Nate Jones
f1aeac361a
adding test for "images -tree"
2013-11-06 04:23:02 +00:00
Nate Jones
d9fe0647cb
adding test for "images -viz"
2013-11-06 04:04:24 +00:00
Nate Jones
059bb7a262
make existing tests pass
2013-11-06 03:58:16 +00:00
Nate Jones
ec9a9a08b8
implement "images -tree"
2013-11-06 03:58:16 +00:00
Nate Jones
8f64759881
bring back /images/viz, but 404 for latest
2013-11-06 03:58:15 +00:00
Nate Jones
2a5998baf1
move "images -viz" to client
2013-11-06 03:58:15 +00:00
Nate Jones
dcf0279a50
fix "images -a"
2013-11-06 03:58:15 +00:00
Nate Jones
d7928b9a67
bump api version and ensure backward compat
2013-11-06 03:58:15 +00:00
Nate Jones
15867ff430
rework images JSON
2013-11-06 03:58:15 +00:00
Mark Allen
3560c922b1
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")
2013-11-05 21:24:37 -06:00
Daniel Norberg
04aca7c9e3
gograph: Use RWMutex to allow concurrent readers
2013-11-05 22:07:14 -05:00
Guillaume J. Charmes
6113e1d62d
Merge pull request #2566 from unclejack/fix_commands_test
...
fix build for commands_test
2013-11-05 15:45:22 -08:00
unclejack
cdf0cf495d
fix build for commands_test
2013-11-06 01:41:54 +02:00
Daniel Norberg
1dc34e2b96
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.
2013-11-05 18:26:07 -05:00
Solomon Hykes
8d6df3a7e2
Remove debug messages
2013-11-05 23:00:20 +00:00
Solomon Hykes
e5f8ab6160
Engine: 'create' creates a container and prints its ID on stdout
2013-11-05 23:00:20 +00:00
Solomon Hykes
5c42b2b512
Fix main()
2013-11-05 23:00:20 +00:00
Solomon Hykes
d3f074494a
Better error reporting in engine logs and unit tests
2013-11-05 23:00:20 +00:00
Solomon Hykes
434f06d03d
Engine: fix a bug when encoding a job environment to json
2013-11-05 23:00:20 +00:00
Solomon Hykes
5a85456d48
Hack: simplify the creation of test directories
2013-11-05 23:00:16 +00:00
Andy Rothfusz
980eda4c25
Merge pull request #2562 from tchaudhri/patch-1
...
(doc) Update ubuntulinux.rst
2013-11-05 14:52:07 -08:00
Andy Rothfusz
bf05eb8ac0
Merge pull request #2423 from rogaha/volumes_doc
...
Added volumes documentation
2013-11-05 14:38:28 -08:00
Tianon Gravi
f3f9f652e1
Merge pull request #2563 from mzdaniel/desktop-integration
...
contrib: Desktop integration. Firefox usecase.
2013-11-05 14:02:13 -08:00
Victor Vieux
2205bb43ea
Merge pull request #2298 from unclejack/2070-validate_src_for_bind_mounts
...
validate source for bind mounts
2013-11-05 13:31:10 -08:00
Daniel Mizyrycki
5af87d1475
contrib: Desktop integration. Firefox usecase.
2013-11-05 13:21:52 -08:00
unclejack
35430e8920
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.
2013-11-05 22:54:24 +02:00
unclejack
4d2ba779e1
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 .
2013-11-05 22:54:24 +02:00
unclejack
f1f39616eb
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.
2013-11-05 22:54:24 +02:00
unclejack
4b8c41c4a2
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.
2013-11-05 22:52:54 +02:00
James Turnbull
e88368b34c
Removed redundant linking example
2013-11-05 14:28:57 -06:00
Tehmasp Chaudhri
4d5ecdbeb4
(doc) Update ubuntulinux.rst
...
small grammar changes - hopefully not worse than original :)
2013-11-05 12:08:56 -07:00
Victor Vieux
114e01cdc1
Merge pull request #2554 from dotcloud/copy-config-on-build
...
Use parent image config in buildfile
2013-11-05 10:54:49 -08:00
Victor Vieux
7f7926525a
Merge pull request #2517 from gurjeet/patch-2
...
Add gurjeet as an author
2013-11-05 10:52:54 -08:00
Solomon Hykes
02ddaad5d9
Engine: optional environment variable 'Logging' in 'serveapi'
2013-11-05 18:39:59 +00:00
Solomon Hykes
4e7cb37dcc
Engine: improved logging and identification of jobs
2013-11-05 18:39:59 +00:00
Solomon Hykes
ca6f0aa107
Engine: don't export private testing utilities
2013-11-05 18:39:59 +00:00
Solomon Hykes
847411a1ee
Engine: fix a bug which caused handlers to be shared between multiple engine instances
2013-11-05 18:39:59 +00:00
Solomon Hykes
7b17d55599
httpapi: don't create a pidfile if it isn't set in the configuration
2013-11-05 18:39:59 +00:00
Solomon Hykes
958b4a8757
Engine: 'start' starts the specified container
2013-11-05 18:39:59 +00:00
Andy Rothfusz
714acf5ade
Merge pull request #2559 from pattichen/master
...
Fix typo
2013-11-05 10:30:15 -08:00
Andy Rothfusz
962a66cd36
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
2013-11-05 10:29:54 -08:00