Michael Crosby
b8b509e1c8
Update aufs driver to new interface spec
2013-11-07 16:46:47 -08:00
Solomon Hykes
01990b65a3
Move Change to the archive package
2013-11-07 16:46:47 -08:00
Solomon Hykes
9ae4bcaaf8
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
2013-11-08 00:45:07 +00:00
Solomon Hykes
f1127b9308
gofmt
2013-11-07 23:58:03 +00:00
Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Solomon Hykes
4a8a7d4edd
devmapper: port to the new driver API and reactivate driver
2013-11-07 22:41:55 +00:00
Solomon Hykes
f2bab1557c
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
2013-11-07 22:38:50 +00:00
Alexander Larsson
484804abff
archive.ApplyLayer() remove files recursively
...
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
2013-11-07 22:46:44 +01:00
Michael Crosby
cd4f7321c9
Merge pull request #2589 from dotcloud/gofmt
...
Go fmt
2013-11-07 12:32:58 -08:00
Solomon Hykes
a63ff8da46
Fix a crash in graphdriver init
2013-11-07 20:31:50 +00:00
Solomon Hykes
77ae9789d3
Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly
2013-11-07 20:30:56 +00:00
Michael Crosby
132db329d4
Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails
...
Fix Assign id as name when all else fails
2013-11-07 12:29:02 -08:00
Guillaume J. Charmes
6998c3c387
go fmt
2013-11-07 12:27:33 -08:00
Victor Vieux
26f846bf77
fix Assign id as name when all else fails
2013-11-07 12:23:29 -08:00
Michael Crosby
b5c984f9b4
Merge pull request #2561 from dotcloud/add_iptabled_errors
...
Make iptable return an error in case of output
2013-11-07 09:15:09 -08:00
Andy Rothfusz
9990db2f5a
Fix bold
2013-11-06 18:07:55 -08:00
andy diller
2d1155407a
updated create, showing how to set expose port and bind to public port for ssh
2013-11-06 18:07:55 -08:00
Andy Rothfusz
37dcff0c13
Merge pull request #2557 from jamtur01/new_redis
...
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
2013-11-06 17:54:34 -08:00
Andy Rothfusz
38f1838e82
Merge pull request #2567 from mck-/patch-1
...
Add -p when running the container (node example)
2013-11-06 17:34:11 -08:00
Andy Rothfusz
807a305f36
Merge pull request #1794 from justone/add-images-tree
...
add -tree option to images
2013-11-06 16:12:36 -08:00
Victor Vieux
cb1c90975b
Merge pull request #2577 from dotcloud/bump_v0.6.6
...
Bump v0.6.6
2013-11-06 13:41:52 -08:00
Nate Jones
363738b8f2
updating cli help doc for images
2013-11-06 12:03:45 -08:00
Victor Vieux
360a694c52
Bump version to v0.6.6
2013-11-06 11:43:02 -08:00
Nate Jones
16eba6bbb5
fix /images/json doc for 1.7
2013-11-06 11:30:04 -08:00
Victor Vieux
0dd6c6645b
Merge pull request #2568 from mrallen1/fix/1965
...
See if a path exists before injecting Reader there
2013-11-06 10:57:06 -08:00
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
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
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
Solomon Hykes
4d90e91243
Merge branch 'finalize-interfaces' into 0.6.5-dm-plugin
2013-11-05 23:24:46 +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