Commit Graph

3846 Commits

Author SHA1 Message Date
164d9c3b6b Create new network on dead ghosts on restart.
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
af2d5e1f07 Introduce failing test case for #2089
Upstream-commit: 4cbb6ce13bf93df2a9e251dfa87fbce9952ab8a6
Component: engine
2013-11-03 11:14:59 -05: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
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
603965c81e Merge pull request #2521 from jamtur01/porttypo
Fixed 127.0.0.0 typo in cli.rst
Upstream-commit: f6b4a1ec9545c230df52d56da807d93f32208730
Component: engine
2013-11-01 14:08:27 -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
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
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
a909cf84d6 Merge pull request #2498 from dotcloud/move-archive
Move archive.go to sub package
Upstream-commit: 4dc156252b952d2577834029fafce97d3db1c5f7
Component: engine
2013-10-31 20:33:53 -07:00
b0e7dd34da fix inspect error message
Upstream-commit: a89a98e59432109d99c08b43f670df7429145172
Component: engine
2013-10-31 18:50:58 -07:00
42fe9c53e7 fix inspect when it returns nothing valid
Upstream-commit: 40ed10cc32fe6dbf18d13a43d42a1a9bed0df902
Component: engine
2013-10-31 18:39:44 -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
4727eb9c29 Merge pull request #2496 from philips/patch-1
Update systemd service file with a better description
Upstream-commit: 3e7b9763aaffb87a82cbb4caacf3f681e0795ae4
Component: engine
2013-10-31 14:55:30 -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
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
73541bce08 Fixes another instant of the password
Upstream-commit: 7e7c931d2b6d667ed97957df37e26b49888933c1
Component: engine
2013-10-31 08:55:14 -04:00
bf5d4694b4 Fixed the quoted text
Upstream-commit: 3a14d4c923109b93ba805e661fa1573c3b2f9db7
Component: engine
2013-10-31 08:46:16 -04:00
0220a89b0a Merge pull request #2481 from tmc/patch-1
Fix typo in redis doc
Upstream-commit: 15457febbbb2c3ea6feee087851449b3717279eb
Component: engine
2013-10-31 01:24:04 -07:00
02e12e8500 correct assignment of $PORT from docker port output
in the example, PORT is assigned to "0.0.0.0:<port>" vs "<port>" as in previous versions of docker (I encountered this documentation discrepancy tonight after installing docker v0.6.5)
Upstream-commit: df1621914b56b4ed20f684363247a9bb0c7acebf
Component: engine
2013-10-31 01:08:16 -04:00
17e208649c Fix typo
Upstream-commit: f77bbfca56e45b4cb405ecb5f2c950c294375b59
Component: engine
2013-10-31 00:07:58 -05:00
3c41e18387 Fixes typo in the CLI documentation
Upstream-commit: 87a250b71186547312dc7b5f6960aae485a465cd
Component: engine
2013-10-30 23:09:02 -04:00
5dfb155fe5 Fixes the password value in the redis/links example
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
2ea7830596 add 0.6.5
Upstream-commit: ca2bbe716c22d90410d388a710642f76f06826df
Component: engine
2013-10-30 19:30:32 -07:00
3ef06332af Reformat CHANGELOG.md
* Add line after headers
* Remove space before bullet points
* Fix ' character
* Create sub-headers
* Group add fix etc. Upper-case
* Use head to trac current progress
Upstream-commit: 13ab83a8a5d5ebd97dc8490355c0b9064d8fe57c
Component: engine
2013-10-30 19:30:32 -07:00
7302345b08 Merge pull request #2473 from dotcloud/remove-panic-from-name
Assign id as name when all else fails
Upstream-commit: 429c3108daee9a9448ac7fa401fd1ad7525c3722
Component: engine
2013-10-30 19:22:57 -07:00
e034785968 Merge pull request #1536 from griff/envfile
Runtime: Keep env variables out of the command line
Upstream-commit: bdbb0371a76864eecd4c3059957417c4b582eba2
Component: engine
2013-10-30 19:20:29 -07:00
1e48612a2b Merge pull request #2470 from metalivedev/2369-docuncompress
Documenting decompression behavior.
Upstream-commit: c1c65f972a0db81be9415c330493e7d76d3a6501
Component: engine
2013-10-30 19:14:51 -07:00
a162db7be1 Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
68c3dce6e6 Merge pull request #2299 from tmc/master
Client: Add -notrunc and -q flags to docker history
RemoteAPI: Add size to history
Upstream-commit: 4dfa28fb95edbd92fc93005040a51fbf923720c2
Component: engine
2013-10-30 18:52:18 -07:00
4eb97d1f45 Assign id as name when all else fails
Upstream-commit: 8227ea35cfc6a8e7e3da7baed5bfa8a62e304df5
Component: engine
2013-10-30 18:31:18 -07:00
67b88fd430 Add flags to history, add size flag
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
67465c23f0 Fixed problem with variables containing \n.
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
fe428bd3cd Support copying value from env with -e option.
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
2013-10-31 01:19:09 +01:00
ddf4ad8def Fix #2369 by documenting decompression behavior.
Upstream-commit: 26f4d6bf59bee7cd4290ea4e31a19da087a180f2
Component: engine
2013-10-30 16:50:58 -07:00
303967e843 Set environment variables using a file.
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00