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
164d9c3b6b
Create new network on dead ghosts on restart.
...
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
bdcce1a98c
Added some more colors and animals to increase the pool
...
Upstream-commit: a51fb4dd35b2324ff4f1f772202d45a944b9d5e1
Component: engine
2013-11-03 11:49:29 -06:00
af2d5e1f07
Introduce failing test case for #2089
...
Upstream-commit: 4cbb6ce13bf93df2a9e251dfa87fbce9952ab8a6
Component: engine
2013-11-03 11:14:59 -05:00
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
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
35f9c13fe5
devmapper: implement OnRemove
...
Upstream-commit: d23b9e87344bd7c153e05abdd05cc28840814a22
Component: engine
2013-11-02 21:25:06 +00:00
938714910e
Add known issues. Fix build warnings.
...
Upstream-commit: 5a9adfe9fb5bc988185ef41ca637fbeee73e947c
Component: engine
2013-11-01 16:06:46 -07:00
f2a6417e83
fix regression in /etc/hosts
...
Upstream-commit: f3685333c0fdea58c8e6adbc93c95ebbc4a9fa47
Component: engine
2013-11-01 15:46:26 -07:00
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
cbce82a91e
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
adc686474c
Add known issues to sections via new "issues" extension.
...
Upstream-commit: 4194617bfe1e29bae2c2515aefbed5f1f2a1ebc1
Component: engine
2013-11-01 15:15:06 -07:00
ff81045ced
Merge pull request #2497 from dotcloud/jpetazzo-escape-apparmor-confinement
...
Runtime: escape apparmor confinement
Upstream-commit: d8bcd1c2315f6487fbd3b2b534fcb318ecbdce2c
Component: engine
2013-11-01 15:07:54 -07:00
f8fdcccb61
rebase
...
Upstream-commit: 7ddd4fe66a00266507848e8ebc1ce3782532b51d
Component: engine
2013-11-01 14:01:32 -07:00
f207545b43
Fixed 127.0.0.0 typo in cli.rst
...
Upstream-commit: dcf4633e95c7f3784cb29b9c1f9510af28b882ed
Component: engine
2013-11-01 14:00:02 -07:00
8cac740175
Merge pull request #2510 from GrilloPress/patch-1
...
Update windows.rst
Upstream-commit: b30dc8c3eaa9f393f44fb8544cd40eb9458e0dbe
Component: engine
2013-11-01 13:56:23 -07:00
cfe12c9c5b
Merge pull request #2512 from dudebout/correct-basics-doc
...
Corrects the TCP section of the basics use
Upstream-commit: feef16bd88c249e8725da85a491c37d7bf2086e3
Component: engine
2013-11-01 13:55:28 -07:00
771aa307b1
use a symlink instead of a copy
...
Upstream-commit: f9901ead069671c04a2f99c83c1e4d8a13597e7b
Component: engine
2013-11-01 13:55:19 -07:00
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
e048f744ba
Merge pull request #2479 from dudebout/port-redirection-doc
...
Port redirection doc
Upstream-commit: 33d8c736fcc0e7fcd18c60ad849caf7e30090755
Component: engine
2013-11-01 13:43:53 -07:00
b69b588093
devmapper: rename Create() to OnCreate(), cleanup tests
...
Upstream-commit: d2c2c2c1162498e6f7c2b9298795e3ef77b6523b
Component: engine
2013-11-01 19:30:30 +00:00
9c7bb08099
Work In Progress: fix devmapper plugin, first independent test passes.
...
Upstream-commit: d64df7c7659560d520a7d8ad8987083e4d52cefc
Component: engine
2013-11-01 19:04:08 +00:00
947a350ef3
Add myself as an author 7e09c633
...
One of my patches was incorporated into Docker, and at that time I didn't know that I was supposed to add myself into this list of contributors.
Commit ID: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e
And a few other patches are already in the pipeline.
Upstream-commit: 9ebac49be00ad140f7a8ef156b9ae7850dd8c273
Component: engine
2013-11-01 12:31:50 -05:00
5287e87035
Merge pull request #2492 from dotcloud/publish-all-flag
...
Add -P flag to publish all exposed ports
Upstream-commit: 65ba2868d7e0084f5edd2fc836d032f39ec39b9a
Component: engine
2013-11-01 10:21:02 -07:00
ee347d7b68
Added explicit Flush method to utils.WriteFlusher
...
Upstream-commit: a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7
Component: engine
2013-11-01 13:11:21 -04:00
c0c39b7770
Rework the port direction documentation
...
+ remove PUBLIC and PRIVATE keywords
+ add the <host_interface>
+ add the -expose flag through a simple link example
+ update the meaning of the EXPOSE command
Upstream-commit: c0e51a8f27defe3d4dde0b5805d3801cf25a6ce2
Component: engine
2013-11-01 12:18:04 -04:00
84bc916ae3
Corrects the TCP section of the basics use
...
Upstream-commit: f2ebccb5aab6600094d92bdb6d4a8ab62bb519d2
Component: engine
2013-11-01 12:14:43 -04:00
c444529939
Update windows.rst
...
Added further information regarding how to access BIOS menus on Windows machines (laptops). My laptop required restarting to find the options and this information will undoubtedly help other users.
Upstream-commit: db2e2e831ba45f173591766160699ec0b0c77f0d
Component: engine
2013-11-01 13:59:25 +00:00
a1a49c8919
Container memory limit can be specified in kilobytes, megabytes or gigabytes
...
-m 10 # 10 bytes
-m 10b # 10 bytes
-m 10k # 10240 bytes (10 * 1024)
-m 10m # 10485760 bytes (10 * 1024 * 1024)
-m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)
Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
Upstream-commit: 9ee9d2f9959390d1cda56accbbd975df18d157ad
Component: engine
2013-11-01 12:00:17 +00:00
b76d80893d
Work In Progress: devmapper backend plugin
...
Upstream-commit: 86dd2473c1351df87520111b1b1ba9953f9e5f09
Component: engine
2013-11-01 05:06:49 +00:00
6fb0ff4f9a
archive.ApplyLayer(): parse a tar archive as a standard aufs-compatible diff, and apply it on a directory
...
Upstream-commit: 318dd33fb778282c3012ee06d892d6375e98cd6b
Component: engine
2013-11-01 05:06:35 +00:00
2e8d2b4ea3
Re-incorporate ChangesDirs() for the use of the devmapper backend,
...
without changing existing prototypes.
This is a neutral change. The primary aufs backend is still in place
and not affected.
Upstream-commit: a5031d47d9ca283c1fd9db1e94cd19f9b9a73af9
Component: engine
2013-11-01 04:52:39 +00:00
c2b31012f8
Partial merge of devmapper/ in order to integrate it as a backend
...
plugin.
The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
Upstream-commit: 36c7a7ae943220ffb1bea9cd47d2f586db00eab2
Component: engine
2013-11-01 04:24:17 +00:00
47ebac600d
rebase and add some filters
...
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
2013-10-31 19:25:55 -07:00
dfa410640a
update docker search to reflect future changes of the api
...
Upstream-commit: 02b52024328996e2028d7d953ef6a9c1e2e50744
Component: engine
2013-10-31 19:14:11 -07:00
a8e4096f40
check port is valid
...
Upstream-commit: 7f07ae9e42061f06886441994977a238013dd5ff
Component: engine
2013-10-31 19:00:14 -07:00
b0e7dd34da
fix inspect error message
...
Upstream-commit: a89a98e59432109d99c08b43f670df7429145172
Component: engine
2013-10-31 18:50:58 -07:00
1f959994cb
rewrite protocol check with switch-case in Server.Daemon
...
Upstream-commit: 7848007c3ab41b3e1d733f9235a69ec59e04ead1
Component: engine
2013-11-01 09:42:44 +08:00
42fe9c53e7
fix inspect when it returns nothing valid
...
Upstream-commit: 40ed10cc32fe6dbf18d13a43d42a1a9bed0df902
Component: engine
2013-10-31 18:39:44 -07:00
f514bb46a5
Initial work on moving aufs to a subpackage
...
Upstream-commit: 699a1074fb9cdf323044f8c132d7130f6a2945bc
Component: engine
2013-10-31 18:07:54 -07:00
fb9771da9e
Move archive.go to sub package
...
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
04226c60be
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
2013-10-31 16:32:49 -07:00
9053b11b66
fix(systemd): provide a better description
...
Fix-up the docker service file description to declare what the service is not what it does.
When a systemd machine starts up the Description of each unit scrolls by instead of the service's filename. Because the current description doesn't say what it is it isn't very friendly:
```
Oct 31 20:40:49 localhost systemd[1]: Started Update Engine.
Oct 31 20:40:49 localhost systemd[1]: Starting Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Reached target Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Starting Easily create lightweight, portable, self-sufficient containers from any application!...
Oct 31 20:40:49 localhost systemd[1]: Started Easily create lightweight, portable, self-sufficient containers from any application!.
```
Upstream-commit: 393562340c6f386a837eac9a616c456dc54faa4f
Component: engine
2013-10-31 14:41:49 -07:00
fefd04077b
Merge pull request #2482 from elee/patch-1
...
correct assignment of $PORT from docker port output
Upstream-commit: d5891f9fb08d8366dc213465e105ed2e3036b264
Component: engine
2013-10-31 12:18:24 -07:00
f1d3f730e4
Merge pull request #2475 from dudebout/patch-2
...
Fixes the password value in the redis/links example
Upstream-commit: 09607bb8f68e6fe45c90514c6acd13d0a6e7087b
Component: engine
2013-10-31 12:17:43 -07:00
f28b4da1c3
Merge pull request #2477 from dudebout/patch-3
...
Fixes typo in the CLI documentation
Upstream-commit: 35044efce55bb07b7309f10129c91bcc14cb513a
Component: engine
2013-10-31 12:17:06 -07:00
44da76a732
Add -P flag to publish all exposed ports
...
Upstream-commit: 652f07bb59e9c46d5f3e375c4a99d0b23771e0ad
Component: engine
2013-10-31 11:28:30 -07:00
76a46c89b0
Merge pull request #2462 from tlunter/fix_remote_api_doc
...
Fix formatting on build-an-image-from-dockerfile-via-stdin
Upstream-commit: 54024ddd8a38881be173eb3124c4019e4ce381ea
Component: engine
2013-10-31 10:56:38 -07:00
33735534d9
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
container.go
Upstream-commit: b543516556bc71663e1db16c026eda378816548a
Component: engine
2013-10-31 10:53:40 -07:00
ce0d02b06f
Merge pull request #2305 from mzdaniel/1800-testing-dind
...
Testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
Upstream-commit: e37a7d49818581a17303aacd06baf1db6835cfd6
Component: engine
2013-10-31 09:42:19 -07:00
