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
Victor Vieux
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
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
Solomon Hykes
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
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
Solomon Hykes
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
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
Guillaume J. Charmes
83558bb275
Merge pull request #2525 from dotcloud/fix_hostnames
...
Fix regression in /etc/hosts
Upstream-commit: 342bd43b766e828753ffec35a6ae9b76e988c483
Component: engine
2013-11-04 11:26:27 -08:00
Guillaume J. Charmes
69a483e207
Merge pull request #2551 from dotcloud/concurrent-db-access
...
Add lock around write operations in graph
Upstream-commit: b380866f443141ee4b6973de22d72378b235194f
Component: engine
2013-11-04 11:24:59 -08:00
Andy Rothfusz
00be4ae87e
Merge pull request #2533 from jamtur01/add_sudo
...
Some format and syntax changes.
Upstream-commit: dc333878d2337684466f0241d19bccf3a4fad4b5
Component: engine
2013-11-04 11:24:51 -08:00
Guillaume J. Charmes
176a3c9fd3
Merge pull request #2501 from dotcloud/2480-check_port-fix
...
check port is valid
Upstream-commit: 261c2e23d3fb158ca94c65e11ae3f249e17c6a31
Component: engine
2013-11-04 11:23:55 -08:00
Michael Crosby
a3ae366b74
Add lock around write operations in graph
...
The graph uses a persistent database connection so
a lock is required because our current sqlite3 driver
does not implement retry logic when the ErrBusy is received.
Upstream-commit: 957db15ef4cef2f3a6b2933260a7806d69ff68e0
Component: engine
2013-11-04 10:28:38 -08:00
Michael Crosby
626d3f3226
Ensure container name on register
...
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
2013-11-04 09:28:40 -08:00
Solomon Hykes
4092fc1017
Integrate devmapper and aufs into the common "graphdriver" framework.
...
aufs is still enabled by default, no mechanism for switching drivers
yet.
Upstream-commit: 98c3693acf2db18c0d0c6211498bf6e1d8f068c6
Component: engine
2013-11-04 17:28:35 +00:00
Solomon Hykes
582c8c2bcd
devmapper: rename plugin*.go to driver*.go
...
Upstream-commit: 6c77f2c1894e906a28a64a4991b4fc2c89cd9ad6
Component: engine
2013-11-04 17:23:46 +00:00
Solomon Hykes
2347b141fc
devmapper: renamed DMBackend to Driver
...
Upstream-commit: b77c5c59840a731c721bbce37765cd475c2cee23
Component: engine
2013-11-04 17:22:43 +00:00
Michael Crosby
748d21d2a0
Merge pull request #2409 from pnasrat/2089-fix-restart-runtime-error
...
Fix restart runtime error with ghost container networking
Upstream-commit: 35690e76b4989eceb0355cdf2f3bf9727a684a41
Component: engine
2013-11-04 08:55:11 -08:00
Michael Crosby
062afa9bce
Merge pull request #2427 from thequux/send-headers-immediately
...
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
2013-11-04 08:49:27 -08:00
Michael Crosby
f35682d510
Merge pull request #2542 from oguzbilgic/changelog-0.6.5
...
Remove duplicate titles in changelog entries of v0.6.5
Upstream-commit: a4ccbc6e9517ba8a39404b8099bbbbac4b577de3
Component: engine
2013-11-04 08:25:22 -08:00
Michael Crosby
a1c937f72b
Merge pull request #2537 from jamtur01/more_names
...
Added some more colors and animals to increase the pool
Upstream-commit: 2824b0523563e5696f6b3d5016b21b26e00f76b6
Component: engine
2013-11-04 08:23:23 -08:00
Michael Crosby
5e088dc278
Merge pull request #2541 from shykes/graph-backend-rename
...
Rename graph backends to 'drivers' which is probably more self-explanatory
Upstream-commit: 3cd4232e52441600dad71117f0612bf9cc5cc028
Component: engine
2013-11-04 08:22:07 -08:00
Oguz Bilgic
3d9c1869fe
Remove duplicate titles in changelog entries of v0.6.5
...
Upstream-commit: fbfb7595b141402ecb3efb2a2c9db2a2168bfbe5
Component: engine
2013-11-04 08:20:05 -05:00
Sven Dowideit
d38ad81595
tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag
...
Upstream-commit: b840b73b08a4f491d0eb8b5a05302342b8bc9242
Component: engine
2013-11-04 22:10:51 +10:00
Sven Dowideit
8c3f937eb2
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
...
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
2013-11-04 22:07:55 +10:00
Solomon Hykes
a4e732c90b
Rename graph backends to 'drivers' which is probably more self-explanatory
...
Upstream-commit: ff42748bc567745198b33baa697338dd697fb621
Component: engine
2013-11-04 01:54:51 +00:00
Paul Nasrat
164d9c3b6b
Create new network on dead ghosts on restart.
...
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
James Turnbull
bdcce1a98c
Added some more colors and animals to increase the pool
...
Upstream-commit: a51fb4dd35b2324ff4f1f772202d45a944b9d5e1
Component: engine
2013-11-03 11:49:29 -06:00
Paul Nasrat
af2d5e1f07
Introduce failing test case for #2089
...
Upstream-commit: 4cbb6ce13bf93df2a9e251dfa87fbce9952ab8a6
Component: engine
2013-11-03 11:14:59 -05:00
James Turnbull
c9ed212566
A variety of syntax and style fixes for the Docker examples
...
* Made Docker a proper noun when needed.
* Fixed code syntax
* Fixed some whitespace issues
* Fixed some typos and grammar
* Tidied up some examples
Upstream-commit: 1cb4557cc8e40f509898bded6684a45070fbb2a4
Component: engine
2013-11-02 18:26:52 -07:00
James Turnbull
beba024082
Some format and syntax changes.
...
* Added sudo as per convention to docker commands
* Break the Dockerfile block up
* Redis is a proper noun
* Minor whitespace fixes
Upstream-commit: c33d26a8da0dc2dd33918bc5e21283dd62f6d755
Component: engine
2013-11-02 17:53:44 -07:00
Solomon Hykes
35f9c13fe5
devmapper: implement OnRemove
...
Upstream-commit: d23b9e87344bd7c153e05abdd05cc28840814a22
Component: engine
2013-11-02 21:25:06 +00:00
Andy Rothfusz
938714910e
Add known issues. Fix build warnings.
...
Upstream-commit: 5a9adfe9fb5bc988185ef41ca637fbeee73e947c
Component: engine
2013-11-01 16:06:46 -07:00
Victor Vieux
f2a6417e83
fix regression in /etc/hosts
...
Upstream-commit: f3685333c0fdea58c8e6adbc93c95ebbc4a9fa47
Component: engine
2013-11-01 15:46:26 -07:00
Victor Vieux
698f7cfe59
Merge pull request #2503 from dotcloud/2500-inspect-fix
...
Client: Inspect fix
Upstream-commit: fc455351977157e7e833d1a5ad3ce48dbf545501
Component: engine
2013-11-01 15:24:05 -07:00