9d87f815bc
change port number through example context
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: b0a65f93a5ab2de540825fab43b4d2ec01f22f36
Component: engine
2015-08-10 23:12:03 +08:00
2db4446de9
Merge pull request #15445 from hqhq/hq_use_docker_daemon
...
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
2015-08-10 10:35:19 -04:00
9ea0204024
Merge pull request #15447 from albers/completion-ps-format
...
Add `docker ps --format` to bash completion
Upstream-commit: 2231c5161eef1314a03f62bf46e4f02f1139fa5c
Component: engine
2015-08-10 10:31:49 -04:00
d12976103a
Add docker ps --format to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c465ba7bdef09ddb06176c8a5f6b787c8e03b402
Component: engine
2015-08-10 06:51:14 -07:00
b49d2589a1
Merge pull request #15426 from BenHall/15425-set-e-install-script-fix
...
Fix install.sh to handle non-zero exit codes when checking lsb_release
Upstream-commit: ba0eba69603e3a000d269c6363a58c5107862193
Component: engine
2015-08-10 08:47:19 -05:00
beef462220
Merge pull request #15437 from calavera/remove_wrong_doc
...
Remove doc that doesn't apply to Journald.
Upstream-commit: 650d5d5d7a06f4d8bfa0e09b974c4c6351c0af21
Component: engine
2015-08-10 08:44:08 -05:00
8120b4d8fe
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
761dc54167
fix typo mistake
...
Signed-off-by: Yibai Zhang <xm1994@gmail.com >
Upstream-commit: fa9e54fbf112c44de05a66330fc22303b1681d05
Component: engine
2015-08-10 16:30:48 +08:00
8adfc237c0
Remove doc that doesn't apply to Journald.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f1412f29423def166b0d77e162eec867afc56a8c
Component: engine
2015-08-09 22:12:42 -05:00
ad4c7580a8
Merge pull request #15400 from vincentbernat/doc/memory-cgroup-overhead
...
doc: add a notice about memory accounting overhead
Upstream-commit: b173314ccad9462be10b245e116399e5dadffa7c
Component: engine
2015-08-09 16:38:41 -07:00
c72c9f1bde
Merge pull request #15411 from moxiegirl/fix-links-15349
...
Fixes #15349 too many apis
Upstream-commit: 8e05a3e30f931726cd5f8a397e5517802cb96efb
Component: engine
2015-08-09 20:52:49 +02:00
33166a62ca
Merge pull request #15431 from charleswhchan/patch-4
...
Cleanup "Automatically start containers" page.
Upstream-commit: 98ec623a8b31745f8456e98d4a703877d1f3a12c
Component: engine
2015-08-09 10:10:42 -07:00
763abc3713
Cleanup "Automatically start containers" page.
...
* Remove old information for Docker 1.2. (See PR #15408 )
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: ad3df4995851df6df767798c39f880c6d0f7e7aa
Component: engine
2015-08-08 17:28:21 -07:00
f05efc7f51
Fix typo in Overlay documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f1f6738d974a5bb4f798a1f01fd074bfb45f681f
Component: engine
2015-08-08 15:11:09 -07:00
df69d73527
Merge pull request #15312 from yyekhlef/fedora_22_doc
...
Fedora 22 manual network configuration and ip forwarding
Upstream-commit: 00843d18d86fe764a7384971392a8a7863bf9a30
Component: engine
2015-08-08 12:59:11 -07:00
14f3afb080
Merge pull request #15408 from ankushagarwal/env-var-docs
...
Make Environment replacement note less kludgy
Upstream-commit: 030df722797295826838d63df5caff5c73746428
Component: engine
2015-08-08 12:56:19 -07:00
4e2e37d904
Merge pull request #15409 from ankushagarwal/wgetcurl
...
Make official install instructions use curl instead of wget
Upstream-commit: 22d539866cbbffb95f1b37c96fa47086b02d3527
Component: engine
2015-08-08 12:51:48 -07:00
a7b91c7783
Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
...
Truncating image id is docker ps to a length of 12
Upstream-commit: cc73fc03e8fe8d339e0be89dd2ad8eda9d06262b
Component: engine
2015-08-08 07:48:16 -04:00
89ab9698f7
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
Upstream-commit: 764aa1a583ba6f73a32af1ba064401967cb716b6
Component: engine
2015-08-08 07:14:53 -04:00
724e66acf4
Fix install.sh to handle non-zero exit codes when checking lsb_release
...
Signed-off-by: Ben Hall <ben@benhall.me.uk >
Upstream-commit: 3b28bada0af08993508af8658d56c15b17ec6fb7
Component: engine
2015-08-08 11:44:52 +01:00
755087c2f9
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
Upstream-commit: bf892dcfcc002ee374057033a940ce2250181066
Component: engine
2015-08-08 01:08:49 -07:00
f2606dcb4e
Typo: remove unconsistent period in docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dc2a7ab7504fb334e4285b24b280a3a49ed33096
Component: engine
2015-08-08 13:06:59 +08:00
f2c4f16feb
Remove useless if-else
...
It is better to use simple form without else.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: c536cec5ea8026b6d93ad53d10bdd2a2cf523d03
Component: engine
2015-08-08 20:02:44 +08:00
305eb65786
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5220f3b535ce38edbff616bc78f1eb92148d310e
Component: engine
2015-08-08 11:28:22 +08:00
3cfa964774
Merge pull request #14965 from stefanberger/nohidevols2
...
Have network files mounted read-only when -v parameter has 'ro' passed
Upstream-commit: 196aa6d62d7084033a37f7085c2b2f55cd744d34
Component: engine
2015-08-07 19:10:59 -07:00
2b85b35ea0
Truncating image id to 12 in docker ps
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: 1a2ccf59eefc14c6bd5abb23f0556ffc5c77bacf
Component: engine
2015-08-07 20:53:48 -04:00
2c6e673ce7
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com >
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
ce79191b6d
Merge pull request #15109 from kevishi/new-config-reader
...
Added support for creating a cliconfig.ConfigFile via io.Reader
Upstream-commit: 1e2765dabbc37979639b72d460e39a00422e77fe
Component: engine
2015-08-07 14:43:55 -07:00
18924c94c4
Merge pull request #14719 from icecrime/14662_update_issue_triage
...
Update issue triaging process
Upstream-commit: 4f349cdd4bde04302ce6afa673b2edcfb9fb13dc
Component: engine
2015-08-07 14:37:31 -07:00
9b317da6c1
Remove note from docker version 1.3 on Env variables
...
Fixes #14734
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 89ec5399aff830ed0b00ff24610969fbf9ad4fdc
Component: engine
2015-08-07 14:36:06 -07:00
130868c480
Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
...
Remove pkg/systemd from validate-lint
Upstream-commit: 7ac357c7954283b29276044cb4225551c0f4d8d3
Component: engine
2015-08-07 14:31:12 -07:00
2be825f7f0
Added support for creating a cliconfig.ConfigFile via io.Reader
...
Signed-off-by: Kevin Shi <kshi@andrew.cmu.edu >
Upstream-commit: 34679e568a22b4f35ff8460f3b5b7bf7089df818
Component: engine
2015-08-07 14:02:03 -07:00
8af88451b7
Remove pkg/systemd from validate-lint
...
Following #15330 , pkg/systemd doesn't exists anymore.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b8559991dcc97c3defee89ed70c3b616152ef583
Component: engine
2015-08-07 22:26:45 +02:00
d3651d98fc
Merge pull request #15014 from brahmaroutu/lint_daemon_graphdriver_overlay
...
daemon/graphdriver/overlay/ fix lint errors/warnings
Upstream-commit: 511009531081cf38a162e7b94b78427243124449
Component: engine
2015-08-07 13:06:56 -07:00
b0a38c37db
Merge pull request #15370 from cpuguy83/better_error_on_client_connect
...
Better/more specific error messages on connect
Upstream-commit: 0262d40ba7d2edc67077a17aebbcdca1e2472a1e
Component: engine
2015-08-07 13:00:44 -07:00
7b7445d1b7
Fixes #15349 too many apis
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1d5f479e01388e1bffcd61f9c3896093ac82d5d0
Component: engine
2015-08-07 11:37:05 -07:00
d20356ab98
daemon/graphdriver/overlay/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: de3944219f23ffe3ac83add4c1f2b0ec0a4cd5c0
Component: engine
2015-08-07 18:34:59 +00:00
c8706706f4
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
2015-08-07 10:51:27 -07:00
8778d71536
Merge pull request #14828 from brahmaroutu/lint_graph_tags
...
/graph/tag fix lint errors/warnings
Upstream-commit: b1009d1fdd551a57e7c266d9cc8122ed3f80aa2c
Component: engine
2015-08-07 10:49:26 -07:00
461b0e0926
Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
...
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
Upstream-commit: 70cae97ee25cacd11868c95338e864e4f0b6681c
Component: engine
2015-08-07 10:47:18 -07:00
3709a03001
Make official install instructions use curl instead of wget
...
YOU GO CURL
Fixes #14650
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: c76fef1791106ca60b7f913a895a77251b695c0a
Component: engine
2015-08-07 10:16:09 -07:00
2781bd4bd9
Add platformSupported flag to enable daemon mode by platform.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 10d30c64579639f30aa857a881cd813a75193887
Component: engine
2015-08-07 09:45:24 -07:00
df2cbb3ee4
Merge pull request #15371 from ankushagarwal/flags
...
Add test to check if subcommands are sorted
Upstream-commit: 38e5764132a535a76b0525a6b357ebba22fe272f
Component: engine
2015-08-07 12:21:00 -04:00
e16f2386a3
Merge pull request #15392 from Microsoft/js/vendor_ansiterm
...
Update vendored go-ansiterm for Windows console
Upstream-commit: 27fd64c67f2db82917db7a5248fc20309295bb13
Component: engine
2015-08-07 09:01:31 -07:00
e53902e3e1
Merge pull request #15385 from jfrazelle/gpg-passphrase-rpm-sign-fix
...
Gpg passphrase rpm sign fix
Upstream-commit: a8026239fc7d52a7cfe61c4d36fe6f7c14c8081e
Component: engine
2015-08-07 08:53:51 -07:00
87c1161542
Just add some code doc around the use of AddXXX func to avoid any confusion
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 592908c0f5dbad90205764002d7b0079ad18b7a4
Component: engine
2015-08-07 08:07:27 -07:00
a3035b6b7d
doc: add a notice about memory accounting overhead
...
The documentation for Debian and Ubuntu explains how to enable memory
and swap accounting but doesn't explain why it is disabled in the first
place. The problem with those subsystems is that they incurs a
performance hit even when not used at all. Add this explanation.
The provided figure are quite vague. The memory overhead is easily
verifiable. It is for example cited in [RedHat documentation][]. For the
performance hit, maybe the performance is better now, but a few years
ago, it was said to be [between 6 and 15%][].
The goal is that people don't just enable memory accounting if they
don't have a use for it.
[RedHat documentation]: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Resource_Management_Guide/sec-memory.html
[between 6 and 15%]: https://lwn.net/Articles/517562/
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 56b33e9f27fa9dc50cec16392ca01bd4234390f9
Component: engine
2015-08-07 14:31:33 +02:00
508816d55a
Add test to check if subcommands are sorted
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 4d212f7853912a2826e1cc725d831515553fde9c
Component: engine
2015-08-07 01:34:21 -07:00
3c26a4792f
Update vendored go-ansiterm for Windows console
...
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: ecf528fcb6d236eae9b1e187152c774393c199fe
Component: engine
2015-08-06 20:48:02 -07:00
5024eec3d4
Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
...
remove docker-unconfined profile we were not using it
Upstream-commit: b9094633f361c1881172fc38e4f91de5659f671b
Component: engine
2015-08-06 20:06:33 -07:00
