7330d7eef7
Oops, break should have been continue
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bbbc720620befd1ba6f1ff9b0ac69a590bdac68e
Component: engine
2016-09-19 14:41:27 -07:00
62c8ac5cdc
Merge pull request #26579 from Microsoft/jjh/ociprocess
...
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02:00
0afc2f6a90
Merge pull request #26025 from dnephin/cli-new-command-structure
...
Restructure CLI Commands
Upstream-commit: ad9ceff3b3497eab655672ab1a9f99bf37a57d43
Component: engine
2016-09-19 22:23:37 +02:00
6851b71de6
Merge pull request #26706 from thaJeztah/update-systemd-instructions
...
Cleanup / sync RHEL, CentOS, Fedora installation docs
Upstream-commit: 920cb5834b66a27b68b83c5b4e81f027103ced68
Component: engine
2016-09-19 22:10:30 +02:00
abf6940f56
Merge pull request #26640 from Microsoft/jjh/removeosversion
...
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04:00
91ef538450
Cleanup / sync RHEL, CentOS, Fedora installation docs
...
These installation procedures are very similar, so
synchronized these docs and removed some differences.
Also;
- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
installation, because most people want to have docker
started automatically (and overlooked this step).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd
Component: engine
2016-09-19 21:30:57 +02:00
88878427f1
Merge pull request #26712 from BlueMonday/master
...
Fix regex for the json-file logger opts in overview.md
Upstream-commit: 772db11fd0cfdf3c22fb93ba69742e81c4a695bb
Component: engine
2016-09-19 21:01:51 +02:00
fec88c3f0c
Merge pull request #26715 from thaJeztah/move-mary-to-alumni
...
Move Mary to alumni
Upstream-commit: 5bcaa0e4bb1173be7bde75c30423cb13f7a56db0
Component: engine
2016-09-19 20:15:23 +02:00
69a3d88de2
Fix regex for the json-file logger opts in overview.md
...
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.
The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.
Signed-off-by: Steven Erenst <stevenerenst@gmail.com >
Upstream-commit: e9a9015e38fc0996a3dae61393885414b092103f
Component: engine
2016-09-19 10:47:40 -07:00
92d37247b3
Windows: OCI process struct convergence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
89cbe8e685
Only hide commands if the env variable is set.
...
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a7c8bcac2ba60d6dd25a1157085d9245bed556ce
Component: engine
2016-09-19 13:28:15 -04:00
84957d85e8
Move the search command to the registry package.
...
And move it back to the top-level command.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dda198761b9638ff1a0f5a4522751267d2faca8a
Component: engine
2016-09-19 13:28:15 -04:00
555894f6f3
Move canonical image and container commands into a command group
...
Hide some top level commands
Add docker container and image inspect commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b993609d5ad4590da72e217bb43786b74aabc183
Component: engine
2016-09-19 13:28:02 -04:00
13bd68497d
Merge pull request #26505 from Microsoft/jjh/ocistep1
...
Windows OCI convergence step 1
Upstream-commit: 3fd3d28f5f82fc44d5e563c8f90dd00f037b9653
Component: engine
2016-09-19 10:23:11 -07:00
8abf4dbc45
Windows: Remove osversion from OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
2016-09-19 10:16:15 -07:00
aa8b9ee0c3
Merge pull request #26577 from Microsoft/jjh/fstabmount
...
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
2016-09-19 10:13:46 -07:00
03207b0f15
Merge pull request #26704 from clbn/patch-1
...
Fix typos in installation doc for Mac
Upstream-commit: 9d2d89ce6fb009d930d46ede87fce285253df984
Component: engine
2016-09-19 18:25:35 +02:00
d0d17890ef
Merge pull request #26708 from thaJeztah/add-evan-as-curator
...
Add Evan as curator
Upstream-commit: 1161b10a0a37fcc9de4aa7c621ff2424578fec66
Component: engine
2016-09-19 18:18:51 +02:00
4fa644c3c4
Move Mary to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6da5889c5b5c7291927073b8d40af00abc67a619
Component: engine
2016-09-19 18:09:30 +02:00
8050d91e8a
Merge pull request #26695 from AkihiroSuda/fix-pause-race
...
Fix a race in libcontainerd/pausemonitor_linux.go
Upstream-commit: 622faab3f64e0e446753c8e9c5f5e7d3d82ec045
Component: engine
2016-09-19 12:03:56 -04:00
14f9dd10a3
Merge pull request #26268 from AkihiroSuda/eventsjsonl
...
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
c64a718ea3
Add Evan as curator
...
Evan is gonna help triaging issues, so
adding him as a "curator" to make it official
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 32161fc052ab4768dfd82b72e0d1f5b405ab6826
Component: engine
2016-09-19 17:09:34 +02:00
388c6920f1
Fix typos in installation doc for Mac
...
Signed-off-by: Alex Olshansky <i@creagenics.com >
Upstream-commit: f7af5cc780cb49b6115c726687dec5ef361ca5fb
Component: engine
2016-09-19 16:04:46 +02:00
519d02c274
Merge pull request #26701 from thaJeztah/fix-markdown-formatting
...
Fix Markdown formatting and missing prompt in service create
Upstream-commit: c2d6e76a704604a964d2a593b8634d0bcbc53cd0
Component: engine
2016-09-19 14:58:06 +02:00
4d3a9b605f
Fix Markdown formatting and missing prompt in service create
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
2016-09-19 13:57:39 +02:00
35a754cee7
Merge pull request #26699 from thaJeztah/update-sshd-example
...
Update sshd example to use ubuntu 16.04
Upstream-commit: b16bfbadddb40337e0694c848ca7664d1bf3119b
Component: engine
2016-09-19 13:17:51 +02:00
91a19ec9c5
Update sshd example to use ubuntu 16.04
...
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b81d12e7a10abfb55f164105365ff175a95ae9e9
Component: engine
2016-09-19 12:52:13 +02:00
a08f3f0525
Merge pull request #25776 from thaJeztah/add-basic-mount-docs
...
Add --mount syntax documentation to CLI reference
Upstream-commit: c496b4eb1b5f308d01677e7273dbd8541dd05ff3
Component: engine
2016-09-19 12:17:07 +02:00
dd0606cd40
Misty's edits and additions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
2016-09-19 12:12:54 +02:00
e605090acb
Add --mount syntax documentation to CLI reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
2016-09-19 11:56:59 +02:00
306c301f92
Merge pull request #26682 from yuexiao-wang/fix-typo
...
Fix typo for docs reference
Upstream-commit: 1ccd79e1a920f9120090f0355cd7b557f8d57631
Component: engine
2016-09-19 11:14:46 +02:00
744afc226e
Merge pull request #26691 from YuPengZTE/devSUSE
...
Add prompt of $
Upstream-commit: abd02a9ba0aea79e0b77b8dfb65c8d77614f3ecf
Component: engine
2016-09-19 10:45:23 +02:00
5a03e9169d
Fix a race in libcontainerd/pausemonitor_linux.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 69f00a137c886bd0e06b9fd2bb438f4eab1ade50
Component: engine
2016-09-19 07:42:21 +00:00
1ea61b91e9
Add prompt of $
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 638546d1206dd229c5e00df0725de6966725b2e0
Component: engine
2016-09-19 10:46:25 +08:00
2a72633153
Merge pull request #26616 from tonistiigi/id-digest
...
Generalize content addressable and reference storage
Upstream-commit: 45a8f680263558657e98c899204a632153b60cde
Component: engine
2016-09-18 09:40:16 -04:00
9a39a676da
Merge pull request #26650 from Microsoft/jjh/firststart
...
Windows: OCI remove first start
Upstream-commit: bc60f5af847d7ae7b466ecca7fc58a9345ee1084
Component: engine
2016-09-18 09:27:10 -04:00
efff8ce2a3
Merge pull request #26578 from Microsoft/jjh/ociuser
...
Windows: Unify OCI user struct
Upstream-commit: 112ba3637da812d4bbfd2095cd71c345eabc1500
Component: engine
2016-09-18 09:20:45 -04:00
41b6bee4d9
Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
...
Fix typo in docs. s/methodoligies/methodologies/
Upstream-commit: fcf77620d632457910507db47f8b7380c7276962
Component: engine
2016-09-18 09:09:40 -04:00
8c00a65ba2
Merge pull request #26678 from YuPengZTE/devSUDO
...
Add bash symbol for sudo
Upstream-commit: 1444401b164006cb13c23208dc8aeebcf980f629
Component: engine
2016-09-18 13:36:13 +02:00
c4eabb777e
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
2016-09-18 11:00:19 +08:00
53e4b9f336
Merge pull request #26676 from Microsoft/jjh/tp5graphdriver
...
Windows: Remove TP5 hack from graphdriver
Upstream-commit: beea4d93dc070a5e6a085aaf7991d7738b65841f
Component: engine
2016-09-17 19:54:58 -07:00
215a6916ca
The hit is missed
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: ced272984157e277523a942505435aa392913ac4
Component: engine
2016-09-18 09:38:20 +08:00
a54b053e2e
Merge pull request #26662 from WeiZhang555/fix-flaky-unit-test
...
Fix flaky unit test
Upstream-commit: 56952e2159f464e2b3a038b81b8d11be45cee308
Component: engine
2016-09-17 18:32:11 -07:00
d5426f0e52
Windows: Remove TP5 hack from graphdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f61315f0df480b261a70278360b08f32c991d3ef
Component: engine
2016-09-17 16:16:50 -07:00
bc5d705612
Fix typo in docs. s/methodoligies/methodologies/
...
Signed-off-by: K Heller <pestophagous@gmail.com >
Upstream-commit: 191adcfb637ea1b52d2da9a75e4e1e4938d9550c
Component: engine
2016-09-17 15:37:03 -07:00
0103a7b417
Merge pull request #26669 from cpuguy83/vendor_syslog
...
re-vendor syslog package
Upstream-commit: 0589358eec634a188eacde422ec8609d3814ca30
Component: engine
2016-09-17 10:27:21 -07:00
5049c43226
Merge pull request #25737 from Microsoft/jjh-statistics
...
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
2016-09-17 09:31:24 -07:00
fe6c7fd94a
re-vendor syslog package
...
Fixes #26394
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f528690674712b680caf2712092c7e2f8f236491
Component: engine
2016-09-17 10:25:05 -04:00
029442b3b0
Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
...
Fix service and tasks API documentation
Upstream-commit: 788a8a3cac67b72d3c52bd3bc8b09fcc0ee438a8
Component: engine
2016-09-17 16:13:15 +02:00
613c0e8111
Merge pull request #26654 from thaJeztah/sync-api-docs
...
Synchronize API docs
Upstream-commit: 1fb556bb7ebed206ebacf13148f912f7347d5489
Component: engine
2016-09-17 16:11:42 +02:00
